From 0ad8e9f526993304fa4d288fc9a6a331b0fac7d3 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@nebulon.de>
Date: Thu, 30 Jun 2016 16:18:10 +0200
Subject: [PATCH] Replace sleep node module with execSync(sleep)

---
 appstore.js                           | 2 +-
 cloudron.js                           | 2 +-
 package.json                          | 1 -
 shell.js                              | 5 +++++
 test/cloudron-autoupdate-sfo1-test.js | 2 +-
 test/cloudron-backup-test.js          | 4 ++--
 test/cloudron-button-test.js          | 6 ++----
 test/cloudron-update-ams3-test.js     | 2 +-
 test/selfhost-ec2-create-test.js      | 1 -
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/appstore.js b/appstore.js
index d570cb7..6f4435a 100644
--- a/appstore.js
+++ b/appstore.js
@@ -3,7 +3,7 @@
 var common = require('./common.js'),
     debug = require('debug')('e2e:appstore'),
     request = require('superagent-sync'),
-    sleep = require('sleep').sleep,
+    sleep = require('./shell.js').sleep,
     stripe = require('stripe');
 
 exports = module.exports = AppStore;
diff --git a/cloudron.js b/cloudron.js
index 210cad1..8ef3a1f 100644
--- a/cloudron.js
+++ b/cloudron.js
@@ -12,7 +12,7 @@ var assert = require('assert'),
     once = require('once'),
     request = require('superagent-sync'),
     smtpTransport = require('nodemailer-smtp-transport'),
-    sleep = require('sleep').sleep,
+    sleep = require('./shell.js').sleep,
     tls = require('tls'),
     url = require('url'),
     util = require('util');
diff --git a/package.json b/package.json
index 84731e2..da29467 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
     "safetydance": "0.0.17",
     "semver": "^4.3.6",
     "should": "^6.0.3",
-    "sleep": "^3.0.0",
     "stripe": "^3.5.0",
     "superagent": "^1.2.0",
     "superagent-sync": "^0.2.0",
diff --git a/shell.js b/shell.js
index 4be600b..319f3eb 100644
--- a/shell.js
+++ b/shell.js
@@ -1,6 +1,7 @@
 'use strict';
 
 exports = module.exports = {
+    sleep: sleep,
     sudo: sudo,
     exec: exec,
     system: system
@@ -14,6 +15,10 @@ var assert = require('assert'),
 
 var SUDO = '/usr/bin/sudo';
 
+function sleep(timeout) {
+    child_process.execSync('sleep ' + timeout);
+}
+
 function exec(tag, file, args, options, callback) {
     assert.strictEqual(typeof tag, 'string');
     assert.strictEqual(typeof file, 'string');
diff --git a/test/cloudron-autoupdate-sfo1-test.js b/test/cloudron-autoupdate-sfo1-test.js
index a6c1e2a..8e822ac 100644
--- a/test/cloudron-autoupdate-sfo1-test.js
+++ b/test/cloudron-autoupdate-sfo1-test.js
@@ -14,7 +14,7 @@ var AppStore = require('../appstore.js'),
     mailer = require('../mailer.js'),
     request = require('superagent-sync'),
     semver = require('semver'),
-    sleep = require('sleep').sleep;
+    sleep = require('../shell.js').sleep;
 
 require('colors');
 
diff --git a/test/cloudron-backup-test.js b/test/cloudron-backup-test.js
index 096d765..144dfcb 100644
--- a/test/cloudron-backup-test.js
+++ b/test/cloudron-backup-test.js
@@ -12,7 +12,7 @@ var AppStore = require('../appstore.js'),
     dnsSync = require('dns-sync'),
     ImapProbe = require('../imap-probe.js'),
     mailer = require('../mailer.js'),
-    sleep = require('sleep').sleep,
+    sleep = require('../shell.js').sleep,
     _ = require('underscore');
 
 require('colors');
@@ -33,7 +33,7 @@ describe('Cloudron backup testing', function () {
         user: process.env.IMAP_USERNAME,
         password: process.env.IMAP_PASSWORD,
         host: process.env.IMAP_HOST,
-        port: 993, // imap port 
+        port: 993, // imap port
         tls: true,
         readOnly: true
     });
diff --git a/test/cloudron-button-test.js b/test/cloudron-button-test.js
index 6f0f333..d5a4f56 100644
--- a/test/cloudron-button-test.js
+++ b/test/cloudron-button-test.js
@@ -6,12 +6,10 @@
 
 var AppStore = require('../appstore.js'),
     assert = require('assert'),
-    async = require('async'),
     Cloudron = require('../cloudron.js'),
     common = require('../common.js'),
-    dns = require('dns'),
     request = require('superagent-sync'),
-    sleep = require('sleep').sleep;
+    sleep = require('../shell.js').sleep;
 
 require('colors');
 
@@ -25,7 +23,7 @@ describe('Appstore button', function () {
 
     var owner = common.getOwner();
     var admin = common.getAdmin();
-    var cloudron, appId, box;
+    var cloudron, box;
 
     it('can login to the store', function () {
         var accessToken = appStore.getAccessToken(owner);
diff --git a/test/cloudron-update-ams3-test.js b/test/cloudron-update-ams3-test.js
index 788cb3e..afb3eed 100644
--- a/test/cloudron-update-ams3-test.js
+++ b/test/cloudron-update-ams3-test.js
@@ -13,7 +13,7 @@ var AppStore = require('../appstore.js'),
     common = require('../common.js'),
     request = require('superagent-sync'),
     semver = require('semver'),
-    sleep = require('sleep').sleep;
+    sleep = require('../shell.js').sleep;
 
 require('colors');
 
diff --git a/test/selfhost-ec2-create-test.js b/test/selfhost-ec2-create-test.js
index 7dbe325..08390b1 100644
--- a/test/selfhost-ec2-create-test.js
+++ b/test/selfhost-ec2-create-test.js
@@ -8,7 +8,6 @@
 
 var AppStore = require('../appstore.js'),
     assert = require('assert'),
-    async = require('async'),
     AWS = require('aws-sdk'),
     child_process = require('child_process'),
     Cloudron = require('../cloudron.js'),