From bc57ea28c40313c488c81fceb063596638b59948 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Mon, 11 May 2020 07:29:47 +0900
Subject: [PATCH] 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)
---
 .zuul.yaml                           | 5 ++---
 openstack_dashboard/api/cinder.py    | 1 +
 openstack_dashboard/settings.py      | 2 +-
 openstack_dashboard/test/settings.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 1490de7c3e..802dcf7946 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -97,14 +97,13 @@
       - ^openstack_dashboard/.*/[^/]*\.spec\.js$
       - ^horizon/static/.*/[^/]*\.spec\.js$
     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 3c14bdc7f9..aff97c951a 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 4e5e8d95d6..81b8e45e19 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -37,7 +37,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 e8407b7a11..0fb3797b4a 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 = '/'