From 80b959f101eb51f33be1665274383c81cbb446b5 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Mon, 15 Jun 2015 22:28:48 -0700
Subject: [PATCH] wait for app after update

---
 cloudron.js         | 6 ++++--
 test/update-test.js | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cloudron.js b/cloudron.js
index 6036187..470f10a 100644
--- a/cloudron.js
+++ b/cloudron.js
@@ -89,7 +89,7 @@ Cloudron.prototype.waitForApp = function (appId) {
     // wait for app to come up
     process.stdout.write('Waiting for app to come up.');
 
-    while (true) {
+    for (var i = 0; i < 40; i++) {
         sleep(10);
         process.stdout.write('.');
         var res = request.get(this._origin + '/api/v1/apps/'+ appId).query({ access_token: this._credentials.accessToken }).end();
@@ -100,6 +100,8 @@ Cloudron.prototype.waitForApp = function (appId) {
             break;
         }
     }
+    assert.strictEqual(res.body.installationState, 'installed');
+    assert.strictEqual(res.body.runState, 'running');
 };
 
 Cloudron.prototype.setCredentials = function (password, accessToken) {
@@ -163,7 +165,7 @@ Cloudron.prototype.update = function (toVersion) {
     console.log('Update started'.green);
 
     process.stdout.write('Waiting for update.');
-    for (var i = 0; i < 30; i++) {
+    for (var i = 0; i < 40; i++) {
         sleep(10);
         res = request.get(this._origin + '/api/v1/cloudron/status').end();
         if (res.statusCode === 200 && res.body.version === toVersion) {
diff --git a/test/update-test.js b/test/update-test.js
index 7f3f110..5512b9c 100644
--- a/test/update-test.js
+++ b/test/update-test.js
@@ -97,6 +97,10 @@ describe('Cloudron update testing', function () {
         cloudron.update(toVersion);
     });
 
+    it('runs the app', function () {
+        cloudron.waitForApp(appId);
+    });
+
     it('can check the addons', function () {
         var res = request.post('https://' + location + '-' + box.domain + '/check_addons').end();
         assert.strictEqual(res.statusCode, 200);