From 5687169de2cc1be50ede9a64a3cb3c8ba429cff9 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 17 Oct 2019 11:37:28 -0400 Subject: [PATCH] Use assertRegex instead of assertRegexpMatches I get these warnings when running against Python 3.7.4: tests/plugins/src.ctf.fs/query/test_query_trace_info.py:192: DeprecationWarning: Please use assertRegex instead. Change-Id: I77cf2efc7aa74c4e4138e08c3ac1b9e618b718cd Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2215 Reviewed-by: Francis Deslauriers Tested-by: jenkins --- tests/plugins/src.ctf.fs/query/test_query_trace_info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py index 41b2b831..77f3fa6a 100644 --- a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py +++ b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py @@ -155,13 +155,13 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): trace = res[0] streams = sorted(trace["stream-infos"], key=sort_predictably) self.assertEqual(len(streams), 2) - self.assertRegexpMatches( + self.assertRegex( str(streams[0]["port-name"]), r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*" + re.escape(str(os_stream_path / "test_stream_0")) + r"$", ) - self.assertRegexpMatches( + self.assertRegex( str(streams[1]["port-name"]), r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*" + re.escape(str(os_stream_path / "test_stream_1")) @@ -185,7 +185,7 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): trace = res[0] streams = sorted(trace["stream-infos"], key=sort_predictably) self.assertEqual(len(streams), 1) - self.assertRegexpMatches( + self.assertRegex( str(streams[0]["port-name"]), r"^2a6422d0-6cee-11e0-8c08-cb07d7b3a564 \| .*" + re.escape(str(os_stream_path)) -- 2.34.1