Merge pull request #70 from testing-cabal/fix-compat

Fix compat

Author: jelmer

testrepository/testcommand.py

@@ -202,7 +202,7 @@ def __init__(
 
     def setUp(self):
         super(TestListingFixture, self).setUp()
-        variable_regex = "\$(IDOPTION|IDFILE|IDLIST|LISTOPT)"
+        variable_regex = r"\$(IDOPTION|IDFILE|IDLIST|LISTOPT)"
         variables = {}
         list_variables = {"LISTOPT": self.listopt}
         cmd = self.template
@@ -350,7 +350,7 @@ def _per_instance_command(self, cmd):
                     # --list-tests cannot use FILES, so handle it being unset.
                     "FILES": getattr(self, "list_file_name", None) or "",
                 }
-                variable_regex = "\$(INSTANCE_ID|COMMAND|FILES)"
+                variable_regex = r"\$(INSTANCE_ID|COMMAND|FILES)"
 
                 def subst(match):
                     return variables.get(match.groups(1)[0], "")
@@ -553,7 +553,7 @@ def _dispose_instances(self):
             dispose_cmd = self.get_parser().get("DEFAULT", "instance_dispose")
         except (ValueError, configparser.NoOptionError):
             return
-        variable_regex = "\$INSTANCE_IDS"
+        variable_regex = r"\$INSTANCE_IDS"
         dispose_cmd = re.sub(
             variable_regex,
             " ".join(sorted(instance.decode("utf") for instance in instances)),
@@ -675,7 +675,7 @@ def obtain_instance(self, concurrency):
             except configparser.NoOptionError:
                 # Instance allocation not configured
                 return None
-            variable_regex = "\$INSTANCE_COUNT"
+            variable_regex = r"\$INSTANCE_COUNT"
             cmd = re.sub(variable_regex, str(concurrency - len(self._instances)), cmd)
             self.ui.output_values([("running", cmd)])
             proc = self.ui.subprocess_Popen(cmd, shell=True, stdout=subprocess.PIPE)

testrepository/tests/test_repository.py

@@ -365,7 +365,7 @@ def test_get_test_run_get_id(self):
         self.assertEqual(inserted, run.get_id())
 
     def test_get_test_run_preserves_time(self):
-        self.skip("Fix me before releasing.")
+        self.skipTest("Fix me before releasing.")
         # The test run outputs the time events that it received.
         now = datetime(2001, 1, 1, 0, 0, 0, tzinfo=iso8601.UTC)
         second = timedelta(seconds=1)