fix runner so it always inits repos as needed

maxkorp · maxkorp · commit 78ae3f22bd8d · 2014-10-27T13:17:03.000-07:00
diff --git a/test/runner.js b/test/runner.js
@@ -2,8 +2,8 @@ var promisify = require("promisify-node");
 var fs = promisify("fs");
 
 // Have to wrap exec, since it has a weird callback signature.
-var exec = promisify(function(command, callback) {
-  return require("child_process").exec(command, callback);
+var exec = promisify(function(command, opts, callback) {
+  return require("child_process").exec(command, opts, callback);
 });
 
 before(function(done) {
@@ -12,17 +12,24 @@ before(function(done) {
   var url = "https://github.com/nodegit/test";
   var done = done.bind(null, null);
 
-  fs.exists("test/repos").then(function() {
-    return fs.mkdir("test/repos").then(function() {
-      return exec("git init test/repos/empty");
-    }).then(function() {
+  function initEmpty() {
+    return exec("git init test/repos/empty");
+  }
+
+  fs.mkdir("test/repos").then(initEmpty, initEmpty)
+    .then(function() {
       return exec("git clone " + url + " test/repos/workdir");
+    }).then(function() {
+      return exec("git checkout rev-walk", {cwd: "test/repos/workdir"})
+    }).then(function() {
+      return exec("git checkout master", {cwd: "test/repos/workdir"})
     }).then(function() {
       var nonrepo = "test/repos/nonrepo";
 
-      return fs.mkdir(nonrepo).then(function() {
+      function writeBogus() {
         return fs.writeFile(nonrepo + "/file.txt", "This is a bogus file");
-      });
-    })
-  }).then(done, done);
+      }
+
+      return fs.mkdir(nonrepo).then(writeBogus, writeBogus);
+    }).then(done, done);
 });
