diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-16 10:38:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-16 10:38:11 +0000 |
| commit | a8adac9456521f8498898d6abc3a3b291bf5f773 (patch) | |
| tree | 50b3f8952c7c4aba38f207c92ca37b82f7baa1ce /trove | |
| parent | bdcb0199d755663ea3b47cb819cc0e81139df4cd (diff) | |
| parent | e01f1004b5aeee3876f27dfb4a97ba00d5c7832a (diff) | |
| download | trove-a8adac9456521f8498898d6abc3a3b291bf5f773.tar.gz | |
Merge "PostgreSQL guest_log test fails intermittently"
Diffstat (limited to 'trove')
| -rw-r--r-- | trove/tests/scenario/runners/guest_log_runners.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/trove/tests/scenario/runners/guest_log_runners.py b/trove/tests/scenario/runners/guest_log_runners.py index fb47dae0..93f7e9c1 100644 --- a/trove/tests/scenario/runners/guest_log_runners.py +++ b/trove/tests/scenario/runners/guest_log_runners.py @@ -129,8 +129,11 @@ class GuestLogRunner(TestRunner): self.assert_equal(expected_type, log_details.type, "Wrong log type for '%s' log" % expected_log_name) current_status = log_details.status.replace(' ', '_') - self.assert_equal(expected_status, current_status, - "Wrong log status for '%s' log" % expected_log_name) + if not isinstance(expected_status, list): + expected_status = [expected_status] + self.assert_is_sublist([current_status], expected_status, + "Wrong log status for '%s' log" % + expected_log_name) if expected_published is None: pass elif expected_published == 0: @@ -654,9 +657,10 @@ class GuestLogRunner(TestRunner): self.assert_log_publish( self.auth_client, log_name, - expected_status=guest_log.LogStatus.Published.name, + expected_status=[guest_log.LogStatus.Published.name, + guest_log.LogStatus.Partial.name], expected_published=self._get_last_log_published(log_name) + 1, - expected_pending=0) + expected_pending=None) def run_test_log_disable_user_after_stop_start(self): expected_status = guest_log.LogStatus.Disabled.name |