Upgrade instances are cleaned up by the upgrade

This commit is contained in:
Johannes Zellner 2016-06-30 15:15:58 +02:00
parent f7ae60f84f
commit e082756138

View File

@ -56,7 +56,7 @@ describe('Selfhost EC2 Cloudron creation', function () {
var ec2 = new AWS.EC2({ accessKeyId: AWS_ACCESS_KEY, secretAccessKey: AWS_ACCESS_SECRET, region: EC2_REGION });
var owner = common.getOwner();
var cloudron, appId, backupInfo, instanceId, newInstanceId, updatedInstanceId;
var cloudron, appId, backupInfo, instanceId, newInstanceId;
it('can create a cloudron', function () {
var params = [
@ -201,10 +201,6 @@ describe('Selfhost EC2 Cloudron creation', function () {
console.error(out.stdout, out.stderr);
assert(false, 'Update failed');
}
updatedInstanceId = out.stdout.split('\n').filter(function (l) { return l.indexOf('ID: ') !== -1; })[0].split(':')[1].trim();
console.log('New instance created with ID', updatedInstanceId);
});
it('runs the app', function () {
@ -223,20 +219,9 @@ describe('Selfhost EC2 Cloudron creation', function () {
cloudron.checkMail(owner, done);
});
// check this after activation
xit('has setup DNS records correctly', function (done) {
async.series([
// cloudron.checkA.bind(cloudron), // this is at user's discretion
cloudron.checkSPF.bind(cloudron),
cloudron.checkDKIM.bind(cloudron),
cloudron.checkMX.bind(cloudron),
// cloudron.checkDMARC.bind(cloudron)
], done);
});
it('can delete the cloudron', function (done) {
var params = {
InstanceIds: [ instanceId, newInstanceId, updatedInstanceId ]
InstanceIds: [ instanceId, newInstanceId ]
};
ec2.terminateInstances(params, done);