From ef3ce7fd40256f17540f687c852a127da316eaa8 Mon Sep 17 00:00:00 2001
From: Isaac Murchie <isaac@saucelabs.com>
Date: Mon, 4 Aug 2014 16:48:05 -0700
Subject: [PATCH] Fix handling of keystore creation

---
 test/functional/common/keystore-base.js | 33 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/test/functional/common/keystore-base.js b/test/functional/common/keystore-base.js
index ec509ec7a..7e31aa713 100644
--- a/test/functional/common/keystore-base.js
+++ b/test/functional/common/keystore-base.js
@@ -3,8 +3,8 @@
 var setup = require("./setup-base")
   , env = require('../../helpers/env')
   , exec = require('child_process').exec
-  , fs = require('fs')
-  , osType = require('os').type();
+  , osType = require('os').type()
+  , rimraf = require('rimraf');
 
 
 module.exports = function () {
@@ -21,23 +21,26 @@ module.exports = function () {
   };
   this.timeout(env.MOCHA_INIT_TIMEOUT);
 
-  var driver;
-  setup(this, desired).then(function (d) { driver = d; });
-
-  it('should be able to launch an app with custom keystore', function (done) {
-    fs.unlink(keystorePath, function (err) {
+  before(function (done) {
+    rimraf(keystorePath, function (err) {
       if (err) return done(err);
-      var cmd = 'keytool -genkey -v -keystore ' + keystorePath + ' -alias ' + keyAlias + ' -storepass android -keypass android -keyalg RSA -validity 14000';
-      var child = exec(cmd, function (err) {
-        if (err) return done(err);
 
-        driver
-          .getCurrentActivity()
-            .should.eventually.include(desired.appActivity)
-          .nodeify(done);
-      });
+      var cmd = 'keytool -genkey -v -keystore ' + keystorePath + ' -alias ' + keyAlias + ' -storepass android -keypass android -keyalg RSA -validity 14000';
+      var child = exec(cmd, done);
       // answer the questions that `keytool` asks
       child.stdin.write('Appium Testsuite\nAppium\nTest\nSan Francisco\nCalifornia\nUS\nyes\n');
     });
   });
+
+  describe('brand-new custom keystore', function () {
+    var driver;
+    setup(this, desired).then(function (d) { driver = d; });
+
+    it('should be able to launch an app with custom keystore', function (done) {
+      driver
+        .getCurrentActivity()
+          .should.eventually.include(desired.appActivity)
+        .nodeify(done);
+    });
+  });
 };