From d2072209b5a97537a9fbcf544c2175076ea7e374 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Tue, 7 Feb 2017 15:26:58 +0100 Subject: [PATCH] Do not automatically reboot the server but do this in a controlled fashion Rebooting the server while connected via ssh often makes ssh return an error code --- test/selfhost-digitalocean-filesystem-test.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/selfhost-digitalocean-filesystem-test.js b/test/selfhost-digitalocean-filesystem-test.js index f4c5297..d88ed6e 100644 --- a/test/selfhost-digitalocean-filesystem-test.js +++ b/test/selfhost-digitalocean-filesystem-test.js @@ -159,11 +159,13 @@ describe('Selfhost DigitalOcean with filesystem backend', function () { assert.strictEqual(out.status, 0); console.log('run cloudron-setup'); - out = machine('ssh ' + params.concat(['"./cloudron-setup --provider digitalocean --prerelease --version ' + toVersion + ' --env staging"']).join(' '));//, { stdout: process.stdout, stderr: process.stderr }); + out = machine('ssh ' + params.concat(['"./cloudron-setup --provider digitalocean --prerelease --version ' + toVersion + ' --env staging --skip-reboot"']).join(' ')); console.log(out.stdout, out.stderr); + assert.strictEqual(out.status, 0); - // due to the reboot, we might get a non 0 status code - assert(out.status === 0 || out.stdout.indexOf('Rebooting this server now to let bootloader changes take effect.') !== -1); + console.log('reboot the server'); + out = machine('ssh ' + params.concat(['systemctl reboot']).join(' ')); + console.log(out.stdout, out.stderr); }); it('can setup dns', function () {