Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added waitUnload as a test helper function

This commit is contained in:
Jan Steemann 2014-06-13 11:31:14 +02:00
parent 9e19e0c6ca
commit 9e03189fb0
3 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/common/modules/org/arangodb/test-helper.js
View File

@ -40,11 +40,6 @@ var processCsvFile = internal.processCsvFile;
// --SECTION-- public variables
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup ArangoShell
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @brief array query
////////////////////////////////////////////////////////////////////////////////
@ -56,13 +51,22 @@ exports.Helper = {
processor(raw_row.toString().split(","));
}
});
},
waitUnload: function (collection) {
var arangodb = require("org/arangodb");
var internal = require("internal");
collection.unload();
internal.flushWal();
while (collection.status() !== arangodb.ArangoCollection.STATUS_UNLOADED) {
collection.unload();
internal.wait(1);
}
}
};
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

28
js/common/tests/shell-document.js
View File

@ -32,23 +32,7 @@ var arangodb = require("org/arangodb");
var ERRORS = arangodb.errors;
var db = arangodb.db;
var wait = require("internal").wait;
var flushWal = require("internal").flushWal;
// -----------------------------------------------------------------------------
// --SECTION-- helper functions
// -----------------------------------------------------------------------------
function waitUnload (collection) {
collection.unload();
flushWal();
while (collection.status() != arangodb.ArangoCollection.STATUS_UNLOADED) {
collection.unload();
wait(1);
}
assertEqual(arangodb.ArangoCollection.STATUS_UNLOADED, collection.status());
}
var testHelper = require("org/arangodb/test-helper").Helper;
// -----------------------------------------------------------------------------
// --SECTION-- collection methods
@ -383,7 +367,7 @@ function CollectionDocumentSuite () {
d1 = null;
d2 = null;
waitUnload(collection);
testHelper.waitUnload(collection);
collection.load();
@ -416,7 +400,7 @@ function CollectionDocumentSuite () {
d1 = null;
d2 = null;
waitUnload(collection);
testHelper.waitUnload(collection);
collection.load();
@ -444,7 +428,7 @@ function CollectionDocumentSuite () {
assertEqual(0, collection.count());
waitUnload(collection);
testHelper.waitUnload(collection);
collection.load();
@ -480,7 +464,7 @@ function CollectionDocumentSuite () {
assertEqual(1, collection.count());
waitUnload(collection);
testHelper.waitUnload(collection);
collection.load();
@ -521,7 +505,7 @@ function CollectionDocumentSuite () {
assertEqual(0, doc.value);
doc = null;
waitUnload(collection);
testHelper.waitUnload(collection);
collection.load();

16
js/common/tests/shell-keygen-noncluster.js
View File

@ -30,6 +30,7 @@ var jsunity = require("jsunity");
var wait = require("internal").wait;
var console = require("console");
var arangodb = require("org/arangodb");
var testHelper = require("org/arangodb/test-helper").Helper;
var ArangoCollection = arangodb.ArangoCollection;
var db = arangodb.db;
@ -282,10 +283,7 @@ function AutoIncrementSuite () {
var d4 = c.save({ });
assertEqual("13", d4._key);
c.unload();
console.log("waiting for collection to unload");
wait(5);
assertEqual(ArangoCollection.STATUS_UNLOADED, c.status());
testHelper.waitUnload(c);
d1 = c.save({ });
assertEqual("17", d1._key);
@ -319,10 +317,7 @@ function AutoIncrementSuite () {
var d4 = c.save({ });
assertEqual("8", d4._key);
c.unload();
console.log("waiting for collection to unload");
wait(5);
assertEqual(ArangoCollection.STATUS_UNLOADED, c.status());
testHelper.waitUnload(c);
d1 = c.save({ });
assertEqual("10", d1._key);
@ -338,10 +333,7 @@ function AutoIncrementSuite () {
d4 = c.save({ _key: "19567" });
assertEqual("19567", d4._key);
c.unload();
console.log("waiting for collection to unload");
wait(5);
assertEqual(ArangoCollection.STATUS_UNLOADED, c.status());
testHelper.waitUnload(c);
d1 = c.save({ });
assertEqual("19568", d1._key);