diff options
| author | Akihiro Motoki <amotoki@gmail.com> | 2020-05-11 07:29:47 +0900 |
|---|---|---|
| committer | Akihiro Motoki <amotoki@gmail.com> | 2020-05-14 16:03:43 +0900 |
| commit | e342c72ce62080985425be184d28190ddfee5f35 (patch) | |
| tree | 9ef598458939ff1201c416665f18fc9e7db1c400 | |
| parent | b2baa1ef973070858ee056c0949b4eff2eaafce1 (diff) | |
| download | horizon-e342c72ce62080985425be184d28190ddfee5f35.tar.gz | |
Fix tempest and pep8 tests
Fix tempest jobs to properly use tempest-horizon as tempest-plugin in
job configuration.
Flake8 3.8.0 fixed a few bugs so that additional issues are marked, fix
these.
Co-Authored-By: Andreas Jaeger <aj@suse.com>
Change-Id: I2aca3286ea2cc1ade567087786781952489d6efa
(cherry picked from commit a0a85dd1768facda2797448cfe008f15913aa7ac)
| -rw-r--r-- | .zuul.yaml | 3 | ||||
| -rw-r--r-- | openstack_dashboard/api/cinder.py | 1 | ||||
| -rw-r--r-- | openstack_dashboard/settings.py | 2 | ||||
| -rw-r--r-- | openstack_dashboard/test/settings.py | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index db422b6a1..1c54c1294 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -71,13 +71,14 @@ - ^openstack_dashboard/dashboards/.*/tests.py$ vars: &base_vars devstack_localrc: - TEMPEST_PLUGINS: "{{ ansible_user_dir }}/src/opendev.org/openstack/tempest-horizon" USE_PYTHON3: true devstack_services: horizon: true tempest: true tempest_concurrency: 2 tempest_test_regex: horizon + tempest_plugins: + - tempest-horizon tox_envlist: all - job: diff --git a/openstack_dashboard/api/cinder.py b/openstack_dashboard/api/cinder.py index 6028efcf4..17a9f81c1 100644 --- a/openstack_dashboard/api/cinder.py +++ b/openstack_dashboard/api/cinder.py @@ -127,6 +127,7 @@ class VolumeBackup(BaseCinderAPIResourceWrapper): 'created_at', 'volume_id', 'availability_zone', 'snapshot_id'] _volume = None _snapshot = None + @property def volume(self): return self._volume diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py index 02cd17ef3..2e907638f 100644 --- a/openstack_dashboard/settings.py +++ b/openstack_dashboard/settings.py @@ -41,7 +41,7 @@ monkeypatch_escape() # Load default values # pylint: disable=wrong-import-position -from openstack_dashboard.defaults import * # noqa: F403,H303 +from openstack_dashboard.defaults import * # noqa: E402,F403,H303 _LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py index 26ac805b3..54779540e 100644 --- a/openstack_dashboard/test/settings.py +++ b/openstack_dashboard/test/settings.py @@ -27,7 +27,7 @@ from openstack_dashboard.utils import settings as settings_utils monkeypatch_escape() # Load default values -from openstack_dashboard.defaults import * # noqa: F403,H303 +from openstack_dashboard.defaults import * # noqa: E402,F403,H303 WEBROOT = '/' |