diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2019-06-12 20:35:29 +1200 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2019-08-25 23:11:54 +1200 |
| commit | dfa5ce93d5f7caa49950d4565bab12fe2dc56ffb (patch) | |
| tree | 43cab6ca3da72c55d4d1975c7d46d95b4432a106 /trove/tests/unittests/taskmanager/test_models.py | |
| parent | c247e4842eb424214da55ca751535d107d87ceab (diff) | |
| download | trove-dfa5ce93d5f7caa49950d4565bab12fe2dc56ffb.tar.gz | |
Improve devmode=flase when building the image
During debugging, the following changes are also included:
- Support to specify an image ID to run the integration test.
- Fix the reboot function bug.
- Remove the unsuccessful restart test.
How to run integration test with dev_mode=false:
ADMIN_PASSWORD=password \
SERVICE_PASSWORD=password \
DEV_MODE=false \
/opt/stack/trove/integration/scripts/trovestack gate-tests mysql mysql
Change-Id: I31d4ee579a554f4c98f9facb9fd4b7779665a3dd
Diffstat (limited to 'trove/tests/unittests/taskmanager/test_models.py')
| -rw-r--r-- | trove/tests/unittests/taskmanager/test_models.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py index 74fb9253..e91ef383 100644 --- a/trove/tests/unittests/taskmanager/test_models.py +++ b/trove/tests/unittests/taskmanager/test_models.py @@ -309,6 +309,7 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest): new_callable=PropertyMock, return_value='fake-hostname') def test_servers_create_block_device_mapping_v2(self, mock_hostname): + self.freshinstancetasks._prepare_userdata = Mock(return_value=None) mock_nova_client = self.freshinstancetasks.nova_client = Mock() mock_servers_create = mock_nova_client.servers.create self.freshinstancetasks._create_server('fake-flavor', 'fake-image', @@ -867,26 +868,23 @@ class BuiltInstanceTasksTest(trove_testtools.TestCase): @patch.object(utils, 'poll_until') def test_reboot(self, mock_poll): - self.instance_task.datastore_status_matches = Mock(return_value=True) - self.instance_task._refresh_datastore_status = Mock() self.instance_task.server.reboot = Mock() self.instance_task.set_datastore_status_to_paused = Mock() self.instance_task.reboot() self.instance_task._guest.stop_db.assert_any_call() - self.instance_task._refresh_datastore_status.assert_any_call() self.instance_task.server.reboot.assert_any_call() self.instance_task.set_datastore_status_to_paused.assert_any_call() @patch.object(utils, 'poll_until') @patch('trove.taskmanager.models.LOG') def test_reboot_datastore_not_ready(self, mock_logging, mock_poll): - self.instance_task.datastore_status_matches = Mock(return_value=False) - self.instance_task._refresh_datastore_status = Mock() + mock_poll.side_effect = PollTimeOut self.instance_task.server.reboot = Mock() self.instance_task.set_datastore_status_to_paused = Mock() + self.instance_task.reboot() + self.instance_task._guest.stop_db.assert_any_call() - self.instance_task._refresh_datastore_status.assert_any_call() assert not self.instance_task.server.reboot.called assert not self.instance_task.set_datastore_status_to_paused.called |