docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #229 from kitematic/regen-certs-if-not-running 

Only regenerate certs if the machine isn't running
This commit is contained in:
Jeffrey Morgan 2015-03-08 22:18:59 -04:00
parent cf50c7b1a1 838b71fa51
commit 96f274069f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__tests__/SetupStore-test.js
View File

@ -73,7 +73,7 @@ describe('SetupStore', function () {
pit('upgrades the vm if it exists and is out of date', function () { pit('upgrades the vm if it exists and is out of date', function () {
machine.exists.mockReturnValue(Promise.resolve(true)); machine.exists.mockReturnValue(Promise.resolve(true));
machine.state.mockReturnValue(Promise.resolve('Running')); machine.state.mockReturnValue(Promise.resolve('Stopped'));
machine.isoversion.mockReturnValue('1.0'); machine.isoversion.mockReturnValue('1.0');
machine.stop.mockReturnValue(Promise.resolve()); machine.stop.mockReturnValue(Promise.resolve());
machine.start.mockReturnValue(Promise.resolve()); machine.start.mockReturnValue(Promise.resolve());
@ -88,9 +88,9 @@ describe('SetupStore', function () {
return setupStore.steps().init.run(() => {}).then(() => { return setupStore.steps().init.run(() => {}).then(() => {
expect(machine.create).not.toBeCalled(); expect(machine.create).not.toBeCalled();
expect(machine.stop).toBeCalled(); expect(machine.stop).toBeCalled();
expect(machine.upgrade).toBeCalled();
expect(machine.regenerateCerts).toBeCalled(); expect(machine.regenerateCerts).toBeCalled();
expect(machine.start).toBeCalled(); expect(machine.start).toBeCalled();
expect(machine.upgrade).toBeCalled();
}); });
}); });
}); });

10
src/SetupStore.js
View File

@ -75,7 +75,9 @@ var _steps = [{
yield machine.create(); yield machine.create();
} }
return; return;
} else if (exists && (yield machine.state()) === 'Saved') { }
if ((yield machine.state()) === 'Saved') {
yield virtualBox.wake(machine.name()); yield virtualBox.wake(machine.name());
} }
@ -85,8 +87,10 @@ var _steps = [{
yield machine.stop(); yield machine.stop();
yield machine.upgrade(); yield machine.upgrade();
} }
yield machine.start(); if ((yield machine.state()) !== 'Running') {
yield machine.regenerateCerts(); yield machine.start();
yield machine.regenerateCerts();
}
}) })
}]; }];