<div dir="ltr">Reviewed-by: Patrick Robb<div> </div><div>A question for main branch maintainers - should this series go directly to the main branch? I don't think I should apply this to next-dts due to the 1/2 patch.</div></div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Dec 14, 2024 at 5:43 AM Ariel Otilibili <<a href="mailto:otilibil@eurecom.fr" target="_blank">otilibil@eurecom.fr</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">* follow up of a discussion with Robin Jarry * since 3.12 invalid escape sequences generate SyntaxWarning * in the future, these invalid sequences will generate SyntaxError * therefore changed syntax to raw string notation. Link: <a href="https://inbox.dpdk.org/dev/D6AMQXRSG8E7.33BAORRHRHV9A@redhat.com/" rel="noreferrer" target="_blank">https://inbox.dpdk.org/dev/D6AMQXRSG8E7.33BAORRHRHV9A@redhat.com/</a> Link: <a href="https://docs.python.org/3/whatsnew/3.12.html#other-language-changes" rel="noreferrer" target="_blank">https://docs.python.org/3/whatsnew/3.12.html#other-language-changes</a> Fixes: 99740300890 ("dts: use Python shell for Scapy instead of XML-RPC") Fixes: 409359adce4 ("dts: fix smoke tests driver regex") Cc: Paul Szczepanek <<a href="mailto:paul.szczepanek@arm.com" target="_blank">paul.szczepanek@arm.com</a>> Cc: Patrick Robb <<a href="mailto:probb@iol.unh.edu" target="_blank">probb@iol.unh.edu</a>> Cc: <a href="mailto:stable@dpdk.org" target="_blank">stable@dpdk.org</a> Suggested-by: Robin Jarry <<a href="mailto:rjarry@redhat.com" target="_blank">rjarry@redhat.com</a>> Signed-off-by: Ariel Otilibili <<a href="mailto:otilibil@eurecom.fr" target="_blank">otilibil@eurecom.fr</a>> --- dts/framework/testbed_model/traffic_generator/scapy.py | 2 +- dts/tests/TestSuite_smoke_tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py b/dts/framework/testbed_model/traffic_generator/scapy.py index 1251ca65a0..f42f663554 100644 --- a/dts/framework/testbed_model/traffic_generator/scapy.py +++ b/dts/framework/testbed_model/traffic_generator/scapy.py @@ -234,6 +234,6 @@ def _shell_start_and_stop_sniffing(self, duration: float) -> list[Packet]: ) # In the string of bytes "b'XXXX'", we only want the contents ("XXXX") list_of_packets_base64 = re.findall( - f"^b'({REGEX_FOR_BASE64_ENCODING})'", packet_strs, re.MULTILINE + fr"^b'({REGEX_FOR_BASE64_ENCODING})'", packet_strs, re.MULTILINE ) return [Ether(base64_bytes(pakt)) for pakt in list_of_packets_base64] diff --git a/dts/tests/TestSuite_smoke_tests.py b/dts/tests/TestSuite_smoke_tests.py index bc3a2a6bf9..a029a564eb 100644 --- a/dts/tests/TestSuite_smoke_tests.py +++ b/dts/tests/TestSuite_smoke_tests.py @@ -136,7 +136,7 @@ def test_device_bound_to_driver(self) -> None: # with the address for the nic we are on in the loop and then captures the # name of the driver in a group devbind_info_for_nic = re.search( - f"{nic.pci}[^\\n]*drv=([\\d\\w-]*) [^\\n]*", + fr"{nic.pci}[^\\n]*drv=([\\d\\w-]*) [^\\n]*", all_nics_in_dpdk_devbind, ) self.verify( -- 2.47.1 </blockquote></div>