directory name mongorestore->restore in mongorestore tests

Former-commit-id: 13cb42616e8abcad77589c54f263b344a1cb8e90

8 files changed, 16 insertions, 12 deletions

diff --git a/common.yml b/common.yml
index 118a6800aac..6b53ffeaffc 100644
--- a/common.yml
+++ b/common.yml
@@ -932,7 +932,7 @@ tasks:
           mv ./mongodb/mongo${extension} .
           mv test/qa-tests/* .
           chmod +x mongo*
-          python buildscripts/smoke.py ${smoke_use_ssl} --nopreallocj --with-cleanbb --mongod ./mongod --mongo ./mongo --report-file report.json --continue-on-failure --buildlogger-builder MCI_${build_variant} --buildlogger-buildnum ${builder_num|} --buildlogger-credentials ./mci.buildlogger --buildlogger-phase ${task_name}_${execution} --authMechanism SCRAM-SHA-1 mongorestore
+          python buildscripts/smoke.py ${smoke_use_ssl} --nopreallocj --with-cleanbb --mongod ./mongod --mongo ./mongo --report-file report.json --continue-on-failure --buildlogger-builder MCI_${build_variant} --buildlogger-buildnum ${builder_num|} --buildlogger-credentials ./mci.buildlogger --buildlogger-phase ${task_name}_${execution} --authMechanism SCRAM-SHA-1 restore
 
 - name: text
   commands:
diff --git a/test/qa-tests/restore/bad_options.js b/test/qa-tests/restore/bad_options.js
index cca5a64c303..eb3c44444ee 100644
--- a/test/qa-tests/restore/bad_options.js
+++ b/test/qa-tests/restore/bad_options.js
@@ -10,12 +10,16 @@
 
     // run restore with both --objcheck and --noobjcheck specified
     var ret = toolTest.runTool('restore', '--objcheck', '--noobjcheck',
-            'mongorestore/testdata/dump_empty');
+            'restore/testdata/dump_empty');
     assert.neq(0, ret);
 
     // run restore with --oplogLimit with a bad timestamp
     ret = toolTest.runTool('restore', '--oplogReplay', '--oplogLimit', 'xxx',
-        'mongorestore/testdata/dump_with_oplog');
+        'restore/testdata/dump_with_oplog');
+    assert.neq(0, ret);
+
+    // run restore with a negative --w value
+    ret = toolTest.runTool('restore', '--w', '-1', 'restore/testdata/dump_empty');
     assert.neq(0, ret);
 
     toolTest.stop();
diff --git a/test/qa-tests/restore/blank_collection_bson.js b/test/qa-tests/restore/blank_collection_bson.js
index 349ffd310f0..d34ef3c1688 100644
--- a/test/qa-tests/restore/blank_collection_bson.js
+++ b/test/qa-tests/restore/blank_collection_bson.js
@@ -11,14 +11,14 @@
     // run the restore with the blank collection file and no
     // metadata file. it should succeed, but insert nothing.
     var ret = toolTest.runTool('restore', '--db', 'test',
-            '--collection', 'blank', 'mongorestore/testdata/blankcoll/blank.bson');
+            '--collection', 'blank', 'restore/testdata/blankcoll/blank.bson');
     assert.eq(0, ret);
     assert.eq(0, toolTest.db.getSiblingDB('test').blank.count());
 
     // run the restore with the blank collection file and a blank
     // metadata file. it should succeed, but insert nothing.
     var ret = toolTest.runTool('restore', '--db', 'test',
-            '--collection', 'blank', 'mongorestore/testdata/blankcoll/blank_metadata.bson');
+            '--collection', 'blank', 'restore/testdata/blankcoll/blank_metadata.bson');
     assert.eq(0, ret);
     assert.eq(0, toolTest.db.getSiblingDB('test').blank.count());
 
diff --git a/test/qa-tests/restore/blank_db.js b/test/qa-tests/restore/blank_db.js
index 44d6f2d7f27..fc5f779c0ee 100644
--- a/test/qa-tests/restore/blank_db.js
+++ b/test/qa-tests/restore/blank_db.js
@@ -9,7 +9,7 @@
 
     // run the restore with the blank db directory. it should succeed, but
     // insert nothing.
-    var ret = toolTest.runTool('restore', '--db', 'test', 'mongorestore/testdata/blankdb');
+    var ret = toolTest.runTool('restore', '--db', 'test', 'restore/testdata/blankdb');
     assert.eq(0, ret);
 
     // success
diff --git a/test/qa-tests/restore/malformed_bson.js b/test/qa-tests/restore/malformed_bson.js
index 756b20bf7d3..ff517e70e04 100644
--- a/test/qa-tests/restore/malformed_bson.js
+++ b/test/qa-tests/restore/malformed_bson.js
@@ -10,7 +10,7 @@
     // run restore, targeting a malformed bson file
     var ret = toolTest.runTool('restore', '--db', 'dbOne', 
             '--collection', 'malformed_coll',
-            'mongorestore/testdata/dump_with_malformed/dbOne/malformed_coll.bson');
+            'restore/testdata/dump_with_malformed/dbOne/malformed_coll.bson');
     assert.neq(0, ret);
 
     toolTest.stop();
diff --git a/test/qa-tests/restore/malformed_metadata.js b/test/qa-tests/restore/malformed_metadata.js
index 37c9cfa0e1b..e53a6f90a2d 100644
--- a/test/qa-tests/restore/malformed_metadata.js
+++ b/test/qa-tests/restore/malformed_metadata.js
@@ -12,7 +12,7 @@
     // metadata.json file.
     var ret = toolTest.runTool('restore', '--db', 'dbOne',
             '--collection', 'malformed_metadata',
-            'mongorestore/testdata/dump_with_malformed/dbOne/malformed_metadata.bson');
+            'restore/testdata/dump_with_malformed/dbOne/malformed_metadata.bson');
     assert.neq(0, ret);
 
     toolTest.stop();
diff --git a/test/qa-tests/restore/oplog_replay_and_limit.js b/test/qa-tests/restore/oplog_replay_and_limit.js
index 1345ccc8554..e4d9b1fabaf 100644
--- a/test/qa-tests/restore/oplog_replay_and_limit.js
+++ b/test/qa-tests/restore/oplog_replay_and_limit.js
@@ -23,7 +23,7 @@
 
     // restore the data, without --oplogReplay. _ids 0-9, which appear in the
     // collection's bson file, should be restored.
-    var ret = toolTest.runTool('restore', 'mongorestore/testdata/dump_with_oplog');
+    var ret = toolTest.runTool('restore', 'restore/testdata/dump_with_oplog');
     assert.eq(0, ret);
     assert.eq(10, testColl.count());
     for (var i = 0; i < 10; i++) {
@@ -35,7 +35,7 @@
 
     // restore the data, with --oplogReplay. _ids 10-14, appearing 
     // in the oplog.bson file, should be inserted as well.
-    ret = toolTest.runTool('restore', '--oplogReplay', 'mongorestore/testdata/dump_with_oplog');
+    ret = toolTest.runTool('restore', '--oplogReplay', 'restore/testdata/dump_with_oplog');
     assert.eq(0, ret);
     assert.eq(15, testColl.count());
     for (var i = 0; i < 15; i++) {
@@ -48,7 +48,7 @@
     // restore the data, with --oplogReplay and --oplogLimit with a
     // value that will filter out { _id: 14 } from getting inserted.
     ret = toolTest.runTool('restore', '--oplogReplay', '--oplogLimit',
-                '1416342266:0', 'mongorestore/testdata/dump_with_oplog');
+                '1416342266:0', 'restore/testdata/dump_with_oplog');
     assert.eq(0, ret);
     assert.eq(14, testColl.count());
     for (var i = 0; i < 14; i++) {
diff --git a/test/qa-tests/restore/symlinks.js b/test/qa-tests/restore/symlinks.js
index ad1b79fc19a..7aa2a9ed7f3 100644
--- a/test/qa-tests/restore/symlinks.js
+++ b/test/qa-tests/restore/symlinks.js
@@ -16,7 +16,7 @@
     var dbTwo = toolTest.db.getSiblingDB('dbTwo');
 
     // restore the data
-    var ret = toolTest.runTool('restore', 'mongorestore/testdata/dump_with_soft_links');
+    var ret = toolTest.runTool('restore', 'restore/testdata/dump_with_soft_links');
     assert.eq(0, ret);
 
     // make sure the data was restored properly