Skip to content

tests: fix SyntaxWarning with Python 3.13 #589

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
merged 1 commit into from
Aug 4, 2025
Merged

tests: fix SyntaxWarning with Python 3.13 #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 24 additions & 24 deletions tests/NodeSetGroupTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ def testGroupResolverSimple(self):

source = UpcallGroupSource(
"simple",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups1.name,
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups1.name,
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups1.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups1.name,
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups1.name,
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups1.name,
None)

# create custom resolver with default source
Expand Down Expand Up @@ -204,9 +204,9 @@ def testGroupResolverAddSourceError(self):
test_groups1 = makeTestG1()

source = UpcallGroupSource("simple",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups1.name,
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups1.name,
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups1.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups1.name,
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups1.name,
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups1.name,
None)

res = GroupResolver(source)
Expand All @@ -219,7 +219,7 @@ def testGroupResolverMinimal(self):
test_groups1 = makeTestG1()

source = UpcallGroupSource("minimal",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups1.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups1.name,
None, None, None)

# create custom resolver with default source
Expand Down Expand Up @@ -678,7 +678,7 @@ def testConfigResolverSources(self):

def testConfigCrossRefs(self):
"""test groups config with cross references"""
f = make_temp_file(dedent("""
f = make_temp_file(dedent(r"""
# A comment

[Main]
Expand All @@ -688,10 +688,10 @@ def testConfigCrossRefs(self):
map: echo example[1-100]

[other]
map: echo "foo: @local:foo" | sed -n 's/^$GROUP:\(.*\)/\\1/p'
map: echo "foo: @local:foo" | sed -n 's/^$GROUP:\(.*\)/\1/p'

[third]
map: printf "bar: @ref-rel\\nref-rel: @other:foo\\nref-all: @*\\n" | sed -n 's/^$GROUP:\(.*\)/\\1/p'
map: printf "bar: @ref-rel\\nref-rel: @other:foo\\nref-all: @*\\n" | sed -n 's/^$GROUP:\(.*\)/\1/p'
list: echo bar
""").encode('ascii'))
res = GroupResolverConfig(f.name)
Expand Down Expand Up @@ -934,9 +934,9 @@ def testGroupResolverND(self):
test_groups4 = makeTestG4()

source = UpcallGroupSource("simple",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups4.name,
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups4.name,
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups4.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups4.name,
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups4.name,
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups4.name,
None)

# create custom resolver with default source
Expand Down Expand Up @@ -1013,9 +1013,9 @@ def test_fromall_grouplist(self):
test_groups2 = makeTestG2()

source = UpcallGroupSource("simple",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups2.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups2.name,
None,
"sed -n 's/^\([0-9A-Za-z_\%%-]*\):.*/\\1/p' %s"
r"sed -n 's/^\([0-9A-Za-z_\%%-]*\):.*/\1/p' %s"
% test_groups2.name,
None)
res = GroupResolver(source)
Expand Down Expand Up @@ -1190,15 +1190,15 @@ def setUp(self):

# create 2 GroupSource objects
default = UpcallGroupSource("default",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % self.test_groups1.name,
"sed -n 's/^all:\(.*\)/\\1/p' %s" % self.test_groups1.name,
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % self.test_groups1.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % self.test_groups1.name,
r"sed -n 's/^all:\(.*\)/\1/p' %s" % self.test_groups1.name,
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % self.test_groups1.name,
None)

source2 = UpcallGroupSource("source2",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % self.test_groups2.name,
"sed -n 's/^all:\(.*\)/\\1/p' %s" % self.test_groups2.name,
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % self.test_groups2.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % self.test_groups2.name,
r"sed -n 's/^all:\(.*\)/\1/p' %s" % self.test_groups2.name,
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % self.test_groups2.name,
None)

resolver = GroupResolver(default)
Expand Down Expand Up @@ -1303,9 +1303,9 @@ def testGroupResolverReverse(self):
test_reverse3 = makeTestR3()

source = UpcallGroupSource("test",
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups3.name,
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups3.name,
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups3.name,
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups3.name,
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups3.name,
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups3.name,
"awk -F: '/^$NODE:/ { gsub(\",\",\"\\n\",$2); print $2 }' %s" % test_reverse3.name)

# create custom resolver with default source
Expand Down
Loading