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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-10-14 11:05:01 +02:00
parent ec83afd8ed fa926a48a7
commit 08a64ca66a
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
UnitTests/HttpInterface/api-async-spec.rb → UnitTests/HttpInterface/api-async-spec-timecritical.rb
View File

4
UnitTests/Makefile.unittests
View File

@ -457,9 +457,9 @@ SHELL_SERVER_ONLY = \
@top_srcdir@/js/server/tests/shell-readonly-noncluster-disabled.js\ @top_srcdir@/js/server/tests/shell-readonly-noncluster-disabled.js\
@top_srcdir@/js/server/tests/shell-wal-noncluster.js \ @top_srcdir@/js/server/tests/shell-wal-noncluster.js \
@top_srcdir@/js/server/tests/shell-sharding-helpers.js \ @top_srcdir@/js/server/tests/shell-sharding-helpers.js \
@top_srcdir@/js/server/tests/shell-compaction-noncluster.js \ @top_srcdir@/js/server/tests/shell-compaction-noncluster-timecritical.js \
@top_srcdir@/js/server/tests/shell-shaped-noncluster.js \ @top_srcdir@/js/server/tests/shell-shaped-noncluster.js \
@top_srcdir@/js/server/tests/shell-tasks.js \ @top_srcdir@/js/server/tests/shell-tasks-timecritical.js \
@top_srcdir@/js/server/tests/shell-transactions-noncluster.js \ @top_srcdir@/js/server/tests/shell-transactions-noncluster.js \
@top_srcdir@/js/server/tests/shell-routing.js \ @top_srcdir@/js/server/tests/shell-routing.js \
@top_srcdir@/js/server/tests/shell-any-noncluster.js \ @top_srcdir@/js/server/tests/shell-any-noncluster.js \

11
js/server/modules/org/arangodb/testing.js
View File

@ -68,6 +68,7 @@
/// - `skipAhuacatl`: if set to true the ahuacatl tests are skipped /// - `skipAhuacatl`: if set to true the ahuacatl tests are skipped
/// - `skipAql`: if set to true the AQL tests are skipped /// - `skipAql`: if set to true the AQL tests are skipped
/// - `skipRanges`: if set to true the ranges tests are skipped /// - `skipRanges`: if set to true the ranges tests are skipped
/// - `skipTimeCritical`: if set to true, time critical tests will be skipped.
/// - `valgrind`: if set to true the arangods are run with the valgrind /// - `valgrind`: if set to true the arangods are run with the valgrind
/// memory checker /// memory checker
/// - `valgrindXmlFileBase`: string to prepend to the xml report name /// - `valgrindXmlFileBase`: string to prepend to the xml report name
@ -108,6 +109,7 @@ var optionsDefaults = { "cluster": false,
"skipBoost": false, "skipBoost": false,
"skipGeo": false, "skipGeo": false,
"skipAhuacatl": false, "skipAhuacatl": false,
"skipTimeCritical": false,
"skipAql": false, "skipAql": false,
"skipRanges": false, "skipRanges": false,
"username": "root", "username": "root",
@ -489,6 +491,7 @@ function performTests(options, testList, testname) {
print("\nTrying",te,"..."); print("\nTrying",te,"...");
if ((te.indexOf("-cluster") === -1 || options.cluster) && if ((te.indexOf("-cluster") === -1 || options.cluster) &&
(te.indexOf("-noncluster") === -1 || options.cluster === false) && (te.indexOf("-noncluster") === -1 || options.cluster === false) &&
(te.indexOf("-timecritical") === -1 || options.skipTimeCritical === false) &&
(te.indexOf("-disabled") === -1)) { (te.indexOf("-disabled") === -1)) {
if (!continueTesting) { if (!continueTesting) {
@ -510,7 +513,7 @@ function performTests(options, testList, testname) {
continueTesting = checkInstanceAlive(instanceInfo); continueTesting = checkInstanceAlive(instanceInfo);
} }
else { else {
print("Skipped because of cluster/non-cluster or disabled."); print("Skipped because of cluster/non-cluster/timecritical or disabled.");
} }
} }
print("Shutting down..."); print("Shutting down...");
@ -583,6 +586,7 @@ testFuncs.shell_client = function(options) {
print("\nTrying",te,"..."); print("\nTrying",te,"...");
if ((te.indexOf("-cluster") === -1 || options.cluster) && if ((te.indexOf("-cluster") === -1 || options.cluster) &&
(te.indexOf("-noncluster") === -1 || options.cluster === false) && (te.indexOf("-noncluster") === -1 || options.cluster === false) &&
(te.indexOf("-timecritical") === -1 || options.skipTimeCritical === false) &&
(te.indexOf("-disabled") === -1)) { (te.indexOf("-disabled") === -1)) {
if (!continueTesting) { if (!continueTesting) {
@ -600,7 +604,7 @@ testFuncs.shell_client = function(options) {
continueTesting = checkInstanceAlive(instanceInfo); continueTesting = checkInstanceAlive(instanceInfo);
} }
else { else {
print("Skipped because of cluster/non-cluster."); print("Skipped because of cluster/non-cluster/timecritical.");
} }
} }
print("Shutting down..."); print("Shutting down...");
@ -748,6 +752,7 @@ function rubyTests (options, ssl) {
print("Considering",n,"..."); print("Considering",n,"...");
if ((n.indexOf("-cluster") === -1 || options.cluster) && if ((n.indexOf("-cluster") === -1 || options.cluster) &&
(n.indexOf("-noncluster") === -1 || options.cluster === false) && (n.indexOf("-noncluster") === -1 || options.cluster === false) &&
(n.indexOf("-timecritical") === -1 || options.skipTimeCritical === false) &&
n.indexOf("replication") === -1) { n.indexOf("replication") === -1) {
args = ["--color", "-I", fs.join("UnitTests","HttpInterface"), args = ["--color", "-I", fs.join("UnitTests","HttpInterface"),
"--format", "d", "--require", tmpname, "--format", "d", "--require", tmpname,
@ -768,7 +773,7 @@ function rubyTests (options, ssl) {
} }
else { else {
print("Skipped because of cluster/non-cluster or replication."); print("Skipped because of cluster/non-cluster/timecritical or replication.");
} }
} }
} }

0
js/server/tests/shell-compaction-noncluster.js → js/server/tests/shell-compaction-noncluster-timecritical.js
View File