Updates tests for flake8 lint issues

freedomofpress · Oct 27, 2020 · 1be7905 · 1be7905
1 parent d4b514f
commit 1be7905
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 34 deletions.
diff --git a/molecule/builder-xenial/tests/testutils.py b/molecule/builder-xenial/tests/testutils.py
@@ -1,11 +1,11 @@
-
-
 class Myvalues:
-  def __init__(self):
-    pass
+    def __init__(self):
+        pass
+
 
 securedrop_test_vars = Myvalues()
 
+
 def inject_vars(value):
     res = Myvalues()
     for key, value in value.items():

diff --git a/molecule/testinfra/app-code/test_haveged.py b/molecule/testinfra/app-code/test_haveged.py
@@ -1,5 +1,3 @@
-import pytest
-
 import testutils
 
 sdvars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/app-code/test_securedrop_rqrequeue.py b/molecule/testinfra/app-code/test_securedrop_rqrequeue.py
@@ -1,5 +1,3 @@
-import pytest
-
 import testutils
 
 securedrop_test_vars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/app-code/test_securedrop_rqworker.py b/molecule/testinfra/app-code/test_securedrop_rqworker.py
@@ -1,5 +1,3 @@
-import pytest
-
 import testutils
 
 sdvars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/app-code/test_securedrop_shredder_configuration.py b/molecule/testinfra/app-code/test_securedrop_shredder_configuration.py
@@ -1,5 +1,3 @@
-import pytest
-
 import testutils
 
 sdvars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/app-code/test_securedrop_source_deleter_configuration.py b/molecule/testinfra/app-code/test_securedrop_source_deleter_configuration.py
@@ -1,5 +1,3 @@
-import pytest
-
 import testutils
 
 securedrop_test_vars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/app/test_paxctld.py b/molecule/testinfra/app/test_paxctld.py
@@ -1,7 +1,4 @@
-import pytest
 import re
-
-
 import testutils
 
 securedrop_test_vars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/common/test_cron_apt.py b/molecule/testinfra/common/test_cron_apt.py
@@ -6,6 +6,7 @@
 test_vars = testutils.securedrop_test_vars
 testinfra_hosts = [test_vars.app_hostname, test_vars.monitor_hostname]
 
+
 @pytest.mark.parametrize('dependency', [
     'cron-apt',
     'ntp'

diff --git a/molecule/testinfra/common/test_fpf_apt_repo.py b/molecule/testinfra/common/test_fpf_apt_repo.py
@@ -8,7 +8,6 @@
 testinfra_hosts = [test_vars.app_hostname, test_vars.monitor_hostname]
 
 
-
 def test_fpf_apt_repo_present(host):
     """
     Ensure the FPF apt repo, apt.freedom.press, is configured.

diff --git a/molecule/testinfra/common/test_ip6tables.py b/molecule/testinfra/common/test_ip6tables.py
@@ -1,5 +1,3 @@
-import pytest
-
 import testutils
 
 test_vars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/common/test_platform.py b/molecule/testinfra/common/test_platform.py
@@ -1,5 +1,3 @@
-import pytest
-
 import testutils
 
 test_vars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/common/test_release_upgrades.py b/molecule/testinfra/common/test_release_upgrades.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 import testutils
 
 test_vars = testutils.securedrop_test_vars

diff --git a/molecule/testinfra/conftest.py b/molecule/testinfra/conftest.py
@@ -9,7 +9,6 @@
 import io
 import os
 import yaml
-import pytest
 import testutils
 
 # The config tests target staging by default. It's possible to override
@@ -54,18 +53,13 @@ def lookup_molecule_info():
     return molecule_instance_config
 
 
-# def pytest_namespace():
-    # return securedrop_import_testinfra_vars(target_host, with_header=True)
-# @pytest.fixture(autouse=True)
-# def set_all_vars():
-    # import fight
 class Myvalues:
-  def __init__(self):
-    pass
+    def __init__(self):
+        pass
+
 
 value = securedrop_import_testinfra_vars(target_host)
 res = Myvalues()
 for key, value in value.items():
     setattr(res, key, value)
 testutils.securedrop_test_vars = res
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     testinfra_hosts = [test_vars.app_hostname, test_vars.monitor_hostname]
     def test_fpf_apt_repo_present(host):
         """
         Ensure the FPF apt repo, apt.freedom.press, is configured.
@@ Expand Down @@