diff --git a/src/routes/test/apps-test.js b/src/routes/test/apps-test.js index 6bac0380d..7e18c68e3 100644 --- a/src/routes/test/apps-test.js +++ b/src/routes/test/apps-test.js @@ -42,7 +42,7 @@ var SERVER_URL = 'http://localhost:' + config.get('port'); // Test image information var TEST_IMAGE_REPO = 'cloudron/test'; -var TEST_IMAGE_TAG = '14.0.0'; +var TEST_IMAGE_TAG = '15.0.0'; var TEST_IMAGE = TEST_IMAGE_REPO + ':' + TEST_IMAGE_TAG; var TEST_IMAGE_ID = child_process.execSync('docker inspect --format={{.Id}} ' + TEST_IMAGE).toString('utf8').trim(); @@ -128,12 +128,7 @@ describe('Apps', function () { return true; } return false; - }, function (error) { - if (error) return done(error); - - console.log('This test can take ~30 seconds to start as it waits for infra to be ready'); - setTimeout(done, 30000); - }); + }, done); }); after(function (done) { @@ -202,7 +197,12 @@ describe('Apps', function () { settings.setDnsConfig.bind(null, { provider: 'route53', accessKeyId: 'accessKeyId', secretAccessKey: 'secretAccessKey', endpoint: 'http://localhost:5353' }), settings.setTlsConfig.bind(null, { provider: 'caas' }), settings.setBackupConfig.bind(null, { provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }) - ], done); + ], function (error) { + if (error) return done(error); + + console.log('This test can take ~30 seconds to start as it waits for infra to be ready'); + setTimeout(done, 30000); + }); } function cleanup(done) { @@ -755,20 +755,16 @@ describe('Apps', function () { expect(!err).to.be.ok(); expect(res.statusCode).to.equal(200); - delete res.body.sendmail; // sendmail auth fails - delete res.body.recvmail; // dovecot mail delivery won't work + delete res.body.recvmail; // unclear why dovecot mail delivery won't work delete res.body.stdenv; // cannot access APP_ORIGIN for (var key in res.body) { - if (res.body[key] !== 'OK') return callback('Not done yet: ' + res.body); + if (res.body[key] !== 'OK') return callback('Not done yet: ' + JSON.stringify(res.body)); } callback(); }); - }, function (error) { - console.log(error); - done(error); - }); + }, done); }); var redisIp, exportedRedisPort; @@ -916,12 +912,11 @@ describe('Apps', function () { expect(!err).to.be.ok(); expect(res.statusCode).to.equal(200); - delete res.body.sendmail; // sendmail auth fails - delete res.body.recvmail; // dovecot mail delivery won't work + delete res.body.recvmail; // unclear why dovecot mail delivery won't work delete res.body.stdenv; // cannot access APP_ORIGIN for (var key in res.body) { - if (res.body[key] !== 'OK') return callback('Not done yet: ' + res.body); + if (res.body[key] !== 'OK') return callback('Not done yet: ' + JSON.stringify(res.body)); } callback(); @@ -1189,12 +1184,11 @@ describe('Apps', function () { expect(!err).to.be.ok(); expect(res.statusCode).to.equal(200); - delete res.body.sendmail; // sendmail auth fails - delete res.body.recvmail; // dovecot mail delivery won't work + delete res.body.recvmail; // unclear why dovecot mail delivery won't work delete res.body.stdenv; // cannot access APP_ORIGIN for (var key in res.body) { - if (res.body[key] !== 'OK') return callback('Not done yet: ' + res.body); + if (res.body[key] !== 'OK') return callback('Not done yet: ' + JSON.stringify(res.body)); } callback(); @@ -1360,12 +1354,11 @@ describe('Apps', function () { expect(!err).to.be.ok(); expect(res.statusCode).to.equal(200); - delete res.body.sendmail; // sendmail auth fails - delete res.body.recvmail; // dovecot mail delivery won't work + delete res.body.recvmail; // unclear why dovecot mail delivery won't work delete res.body.stdenv; // cannot access APP_ORIGIN for (var key in res.body) { - if (res.body[key] !== 'OK') return callback('Not done yet: ' + res.body); + if (res.body[key] !== 'OK') return callback('Not done yet: ' + JSON.stringify(res.body)); } callback(); diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js index 8e3d2e3e3..a8508c652 100644 --- a/src/test/apptask-test.js +++ b/src/test/apptask-test.js @@ -31,7 +31,7 @@ var MANIFEST = { "contactEmail": "support@cloudron.io", "version": "0.1.0", "manifestVersion": 1, - "dockerImage": "cloudron/test:8.0.0", + "dockerImage": "cloudron/test:15.0.0", "healthCheckPath": "/", "httpPort": 7777, "tcpPorts": { diff --git a/src/test/checkInstall b/src/test/checkInstall index ce48ee2bd..1c85b0f3b 100755 --- a/src/test/checkInstall +++ b/src/test/checkInstall @@ -3,7 +3,7 @@ set -eu readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" -readonly TEST_IMAGE="cloudron/test:14.0.0" +readonly TEST_IMAGE="cloudron/test:15.0.0" source ${SOURCE_DIR}/src/INFRA_VERSION