| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Whoops, forgot about changing libtaskotron when I made that change in testcloud.
Thanks for the fix
| Path | Packages | |||
|---|---|---|---|---|
| M | libtaskotron/ext/disposable/vm.py (1 line) | |||
| M | testing/test_vm.py (2 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| b676f68d5ae6 | 52ed20c3cdad | d107d7155aa8 | Martin Krizek | We need to start testcloud domain explicitly now (Show More…) | Dec 4 2015, 5:08 PM |
| Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Line(s) | 24 | class TestCloudMachine(object): | |||
|---|---|---|---|---|---|
| 70 | def _prepare_instance(self, tc_image): | 70 | def _prepare_instance(self, tc_image): | ||
| 71 | '''Prepare an instance for booting and boot it with testcloud''' | 71 | '''Prepare an instance for booting and boot it with testcloud''' | ||
| 72 | log.debug("preparing testcloud instance {}".format(self.instancename)) | 72 | log.debug("preparing testcloud instance {}".format(self.instancename)) | ||
| 73 | tc_instance = instance.Instance(self.instancename, tc_image, hostname=self.hostname) | 73 | tc_instance = instance.Instance(self.instancename, tc_image, hostname=self.hostname) | ||
| 74 | tc_instance.prepare() | 74 | tc_instance.prepare() | ||
| 75 | 75 | | |||
| 76 | log.debug("spawning testcloud instance {}".format(self.instancename)) | 76 | log.debug("spawning testcloud instance {}".format(self.instancename)) | ||
| 77 | tc_instance.spawn_vm() | 77 | tc_instance.spawn_vm() | ||
| 78 | tc_instance.boot() | ||||
| 78 | 79 | | |||
| 79 | def _check_existing_instance(self, should_exist=False): | 80 | def _check_existing_instance(self, should_exist=False): | ||
| 80 | '''Check whether an instance with the same name already exists, raise errors if the result | 81 | '''Check whether an instance with the same name already exists, raise errors if the result | ||
| 81 | was not as expected. | 82 | was not as expected. | ||
| 82 | 83 | | |||
| 83 | :param should_exist: sets expectation on whether the instance should | 84 | :param should_exist: sets expectation on whether the instance should | ||
| 84 | exist already or not | 85 | exist already or not | ||
| 85 | :raises TaskotronRemoteError: if the preset expectation is not met | 86 | :raises TaskotronRemoteError: if the preset expectation is not met | ||
| ▲ Show 20 Lines • Show All 162 Lines • Show Last 20 Lines | |||||
| Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s) | 49 | def should_make_proper_calls(self, monkeypatch): | |||
|---|---|---|---|---|---|
| 52 | stub_instanceclass = Mock(return_value=stub_instance) | 52 | stub_instanceclass = Mock(return_value=stub_instance) | ||
| 53 | 53 | | |||
| 54 | monkeypatch.setattr(instance, 'Instance', stub_instanceclass) | 54 | monkeypatch.setattr(instance, 'Instance', stub_instanceclass) | ||
| 55 | 55 | | |||
| 56 | test_vm = vm.TestCloudMachine(self.ref_uuid) | 56 | test_vm = vm.TestCloudMachine(self.ref_uuid) | ||
| 57 | 57 | | |||
| 58 | test_vm._prepare_instance(stub_image) | 58 | test_vm._prepare_instance(stub_image) | ||
| 59 | 59 | | |||
| 60 | assert stub_instance.method_calls == [('prepare',), ('spawn_vm',)] | 60 | assert stub_instance.method_calls == [('prepare',), ('spawn_vm',), ('boot',)] | ||
| 61 | 61 | | |||
| 62 | 62 | | |||
| 63 | class TestvmStop(object): | 63 | class TestvmStop(object): | ||
| 64 | '''Test libtaskotron.vm._stop_instance''' | 64 | '''Test libtaskotron.vm._stop_instance''' | ||
| 65 | 65 | | |||
| 66 | def setup_method(self, method): | 66 | def setup_method(self, method): | ||
| 67 | self.ref_uuid = '1234-5678-9012' | 67 | self.ref_uuid = '1234-5678-9012' | ||
| 68 | 68 | | |||
| ▲ Show 20 Lines • Show All 130 Lines • Show Last 20 Lines | |||||