Skip to content

Fix compat #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jelmer merged 2 commits into from
Jan 27, 2026
Merged

Fix compat #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64c7918
Fix warnings on newer python
jelmer Jan 27, 2026
b9391ba
Fix compatibility with testtools
jelmer Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions testrepository/testcommand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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], "")
Expand Down Expand Up @@ -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)),
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion testrepository/tests/test_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading