summaryrefslogtreecommitdiff
path: root/conftest.py
diff options
context:
space:
mode:
authorJames Falcon <james.falcon@canonical.com>2021-12-15 20:16:38 -0600
committerGitHub <noreply@github.com>2021-12-15 19:16:38 -0700
commitbae9b11da9ed7dd0b16fe5adeaf4774b7cc628cf (patch)
tree1fbb3269fc87e39832e3286ef42eefd2b23fcd44 /conftest.py
parent2bcf4fa972fde686c2e3141c58e640640b44dd00 (diff)
downloadvyos-cloud-init-bae9b11da9ed7dd0b16fe5adeaf4774b7cc628cf.tar.gz
vyos-cloud-init-bae9b11da9ed7dd0b16fe5adeaf4774b7cc628cf.zip
Adopt Black and isort (SC-700) (#1157)
Applied Black and isort, fixed any linting issues, updated tox.ini and CI.
Diffstat (limited to 'conftest.py')
-rw-r--r--conftest.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/conftest.py b/conftest.py
index f3f8c036..ffcb3233 100644
--- a/conftest.py
+++ b/conftest.py
@@ -138,6 +138,7 @@ def disable_subp_usage(request, fixture_utils):
" this either by modifying your test code, or by modifying"
" disable_subp_usage to handle precedence."
)
+
else:
# Look this up before our patch is in place, so we have access to
# the real implementation in side_effect
@@ -203,7 +204,7 @@ def paths(tmpdir):
return helpers.Paths(dirs)
-@pytest.fixture(autouse=True, scope='session')
+@pytest.fixture(autouse=True, scope="session")
def monkeypatch_system_info():
def my_system_info():
return {
@@ -213,7 +214,7 @@ def monkeypatch_system_info():
"python": "invalid",
"uname": ["invalid"] * 6,
"dist": ("Distro", "-1.1", "Codename"),
- "variant": "ubuntu"
+ "variant": "ubuntu",
}
util.system_info = my_system_info