Python2.7 backports for test.support

tests/testapp/tests/compat.py

@@ -0,0 +1,10 @@
+try:
+    # In the Python 2.7 GH workflows, we have to install backported version
+    from backports.test.support import EnvironmentVarGuard # noqa F401
+except ImportError:
+    try:
+        # For python >2.7 and <3.10
+        from test.support import EnvironmentVarGuard # noqa F401
+    except ImportError:
+        # In Python 3.10, this has been moved to test.support.os_helper
+        from test.support.os_helper import EnvironmentVarGuard # noqa F401

tests/testapp/tests/helpers.py

@@ -3,7 +3,6 @@
 """
 import json
 import uuid
-from test.support import EnvironmentVarGuard
 
 import factory
 import mock
@@ -18,6 +17,7 @@
 from facility_profile.models import MyUser
 from facility_profile.models import SummaryLog
 
+from .compat import EnvironmentVarGuard
 from morango.api.serializers import BufferSerializer
 from morango.models.core import AbstractStore
 from morango.models.core import Buffer

tests/testapp/tests/integration/test_syncsession.py

@@ -1,6 +1,5 @@
 import contextlib
 import json
-from test.support import EnvironmentVarGuard
 
 import mock
 import pytest
@@ -12,6 +11,7 @@
 from facility_profile.models import SummaryLog
 from requests.exceptions import Timeout
 
+from ..compat import EnvironmentVarGuard
 from morango.errors import MorangoError
 from morango.models.certificates import Certificate
 from morango.models.certificates import Filter

tests/testapp/tests/sync/test_controller.py

@@ -1,7 +1,6 @@
 import contextlib
 import json
 import uuid
-from test.support import EnvironmentVarGuard
 
 import factory
 import mock
@@ -12,6 +11,7 @@
 from facility_profile.models import MyUser
 from facility_profile.models import SummaryLog
 
+from ..compat import EnvironmentVarGuard
 from ..helpers import serialized_facility_factory
 from ..helpers import TestSessionContext
 from morango.constants import transfer_stages

tests/testapp/tests/test_api.py

@@ -1,7 +1,6 @@
 import json
 import sys
 import uuid
-from test.support import EnvironmentVarGuard
 
 from django.db import connection
 from django.test.utils import CaptureQueriesContext
@@ -13,6 +12,7 @@
 from facility_profile.models import MyUser
 from rest_framework.test import APITestCase as BaseTestCase
 
+from .compat import EnvironmentVarGuard
 from morango.api.serializers import BufferSerializer
 from morango.api.serializers import CertificateSerializer
 from morango.api.serializers import InstanceIDSerializer

tests/testapp/tests/test_uuid_utilities.py

@@ -1,14 +1,14 @@
 import hashlib
-import mock
 import sys
 import uuid
 
+import mock
 from django.test import TestCase
 from facility_profile.models import Facility
 from facility_profile.models import InteractionLog
 from facility_profile.models import MyUser
-from test.support import EnvironmentVarGuard
 
+from .compat import EnvironmentVarGuard
 from morango.errors import InvalidMorangoSourceId
 from morango.models.core import DatabaseIDModel
 from morango.models.core import InstanceIDModel
@@ -157,9 +157,9 @@ def test_consistent_0_5_instance_id(self, *args):
             env["MORANGO_SYSTEM_ID"] = "magicsysid"
 
             DatabaseIDModel.objects.all().update(current=False)
-            database_id = DatabaseIDModel.objects.create(
+            DatabaseIDModel.objects.create(
                 id="7fe445b75cea11858c00fb97bdee8878", current=True
-            ).id
+            )
 
             self.assertEqual(get_0_5_system_id(), "54940f560a55bbf7d86b")
             self.assertEqual(get_0_5_mac_address(), "804f4c20d3b2b5a29b95")
@@ -197,7 +197,6 @@ def test_envvar_overrides(self, *args):
 
             self.assertEqual(instance.id, expected_id)
 
-
     @mock.patch(
         "ifcfg.interfaces",
         return_value={"eth0": {"device": "eth0", "ether": "a0:aa:aa:aa:aa"}},

tox.ini

@@ -28,6 +28,7 @@ deps =
   cryptography1.2: cryptography==1.2.3
   cryptography1.8: cryptography==1.8.2
   cryptography2.3: cryptography==2.3.1
+  py2.7: backports.test.support==0.1.1
 
 commands =
   sh -c '! tests/testapp/manage.py makemigrations --dry-run --exit --noinput'