diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2019-12-19 13:24:32 +1300 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2019-12-19 15:20:35 +1300 |
| commit | 38b6f5ef705c158476375896d0cd38a5a2145e87 (patch) | |
| tree | b472d298a413b49da41976bbd3be6382a81fa77e | |
| parent | 09e3a53737e4b97ce1d617315419d690bbc1e8d8 (diff) | |
| download | trove-38b6f5ef705c158476375896d0cd38a5a2145e87.tar.gz | |
Use stable/train for trovestack pip constraints
- Use stable/train branch for python-troveclient
- Fix the log publish related test cases
Change-Id: I4c08fe8b90e4b2879eb937aebc9d53789698f58d
| -rw-r--r-- | test-upper-constraints.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 4 | ||||
| -rw-r--r-- | trove/tests/scenario/runners/guest_log_runners.py | 10 |
3 files changed, 6 insertions, 10 deletions
diff --git a/test-upper-constraints.txt b/test-upper-constraints.txt index fe1a3651..529cd6e8 100644 --- a/test-upper-constraints.txt +++ b/test-upper-constraints.txt @@ -1 +1 @@ -git+https://opendev.org/openstack/python-troveclient#egg=python-troveclient +git+https://opendev.org/openstack/python-troveclient@stable/train#egg=python-troveclient @@ -122,11 +122,7 @@ deps = [testenv:trovestack] basepython = python3 -skip_install = True changedir = {toxinidir}/integration/scripts passenv = * commands = - pip install --no-binary :all: {toxinidir} \ - -c/opt/stack/trove/test-upper-constraints.txt \ - -chttps://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt ./trovestack {posargs} diff --git a/trove/tests/scenario/runners/guest_log_runners.py b/trove/tests/scenario/runners/guest_log_runners.py index aebae74b..34e50b60 100644 --- a/trove/tests/scenario/runners/guest_log_runners.py +++ b/trove/tests/scenario/runners/guest_log_runners.py @@ -727,9 +727,9 @@ class GuestLogRunner(TestRunner): self.admin_client, log_name, expected_type=guest_log.LogType.SYS.name, - expected_status=guest_log.LogStatus.Partial.name, - expected_published=1, expected_pending=1, - is_admin=True) + expected_status=[guest_log.LogStatus.Published.name, + guest_log.LogStatus.Partial.name], + expected_published=1, is_admin=True) def run_test_log_publish_again_sys(self): log_name = self._get_unexposed_sys_log_name() @@ -737,9 +737,9 @@ class GuestLogRunner(TestRunner): self.admin_client, log_name, expected_type=guest_log.LogType.SYS.name, - expected_status=guest_log.LogStatus.Partial.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=1, is_admin=True) def run_test_log_generator_sys(self): |