Skip to content
Snippets Groups Projects
Commit 61b6baae authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

py3: use bytes for the revset checking

The command output is bytes, we need to feed bytes to the associated operation.
parent 766f0783
No related branches found
No related tags found
No related merge requests found
......@@ -356,7 +356,7 @@
"59338f9561099de77c684c00f76507f11e46ebe8, skipping."
)
self.skip_suite_if_not_in_revset(
revset="59338f9561099de77c684c00f76507f11e46ebe8::",
revset=b"59338f9561099de77c684c00f76507f11e46ebe8::",
message=message
)
......@@ -368,7 +368,7 @@
"revision 94167e701e12, skipping."
)
self.skip_suite_if_not_in_revset(
revset="94167e701e125dce1788e19b1e1489958235e40c::",
revset=b"94167e701e125dce1788e19b1e1489958235e40c::",
message=message
)
......@@ -380,7 +380,7 @@
"revision aa21a9ad46ea, skipping."
)
self.skip_suite_if_not_in_revset(
revset="aa21a9ad46ea::",
revset=b"aa21a9ad46ea::",
message=message
)
......@@ -431,9 +431,9 @@
def _matchrevset(self, revset, target_rev):
"""return True if <target-rev> is within <revset>"""
tmpl = "({}) and ({})"
full_revset = tmpl.format(revset, target_rev)
match_pattern = 'ASV-REVSET-MATCH'
tmpl = b"(%s) and (%s)"
full_revset = tmpl % (revset, target_rev)
match_pattern = b'ASV-REVSET-MATCH'
# TODO use `hg test` if/when it is stable
command = [
self.hgpath,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment