test commit

requirements.txt

@@ -7,6 +7,6 @@ dnspython>=1.15.0
 stups-pierone>=1.0.34
 boto3>=1.3.0
 botocore>=1.4.10
-pytest>=3.6.3
+pytest>=6.2.0
 raven
 typing

tests/fixtures.py → tests/conftest.py

@@ -288,10 +288,11 @@ def disable_version_check(monkeypatch):
     monkeypatch.setattr('senza.subcommands.root.check_senza_version', m)
 
 
-@pytest.fixture(autouse=True)
-def valid_regions(monkeypatch):
-    m_session = MagicMock()
-    m_session.return_value = m_session
-    m_session.get_available_regions.return_value = ['aa-fakeregion-1']
-    monkeypatch.setattr('boto3.session.Session', m_session)
-    return m_session
+@pytest.fixture(autouse=True, scope="session")
+def valid_regions():
+    with pytest.MonkeyPatch.context() as monkeypatch:
+        m_session = MagicMock()
+        m_session.return_value = m_session
+        m_session.get_available_regions.return_value = ['aa-fakeregion-1']
+        monkeypatch.setattr('boto3.session.Session', m_session)
+        yield m_session

tests/test_cli.py

@@ -27,9 +27,8 @@
 from senza.subcommands.root import cli
 from senza.traffic import PERCENT_RESOLUTION, StackVersion
 
-from fixtures import (HOSTED_ZONE_EXAMPLE_NET,  # noqa: F401
-                      HOSTED_ZONE_EXAMPLE_ORG, boto_client, boto_resource,
-                      disable_version_check, valid_regions)
+from conftest import (HOSTED_ZONE_EXAMPLE_NET,  # noqa: F401
+                      HOSTED_ZONE_EXAMPLE_ORG)
 
 
 def test_invalid_definition():

tests/test_components.py

@@ -30,8 +30,7 @@
 from senza.components.weighted_dns_elastic_load_balancer_v2 import \
     component_weighted_dns_elastic_load_balancer_v2
 
-from fixtures import (HOSTED_ZONE_ZO_NE_COM, HOSTED_ZONE_ZO_NE_DEV,  # noqa: F401
-                      boto_resource, boto_client)
+from conftest import (HOSTED_ZONE_ZO_NE_COM, HOSTED_ZONE_ZO_NE_DEV)  # noqa: F401
 
 
 def test_invalid_component():

tests/test_subcommands/test_config.py

@@ -6,8 +6,6 @@
 from senza.cli import cli
 from senza.subcommands.config import configuration
 
-from fixtures import disable_version_check  # noqa: F401
-
 
 def create_config(app_dir):
     configuration.config_path = Path(app_dir) / 'config.yaml'

tests/test_subcommands/test_root.py

@@ -6,8 +6,6 @@
 from requests.exceptions import HTTPError, Timeout
 from senza.subcommands.root import check_senza_version, cli
 
-from fixtures import disable_version_check  # noqa: F401
-
 
 @fixture()
 def mock_get_app_dir(monkeypatch):