X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2Fsrc.ctf.fs%2Fquery%2Ftest_query_trace_info.py;fp=tests%2Fplugins%2Fsrc.ctf.fs%2Fquery%2Ftest_query_trace_info.py;h=a63fe04f1f86ca14eb374157b1ba42617be24747;hb=f2bad367743dbcfae25a8b05141ab84b042a6904;hp=c1e87e3976de29e1402f39529b6cc366eb6e8a61;hpb=5cc867eb974cea138f300d200a2f09467b282640;p=babeltrace.git 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 c1e87e39..a63fe04f 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 @@ -18,6 +18,7 @@ import unittest import bt2 import os import re +from pathlib import PureWindowsPath, PurePosixPath test_ctf_traces_path = os.environ['BT_CTF_TRACES_PATH'] @@ -152,17 +153,28 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): ] }, ) + + os_stream_path = PurePosixPath( + '/tests/data/ctf-traces/intersection/3eventsintersect/' + ) + if os.environ['BT_OS_TYPE'] == 'mingw': + os_stream_path = PureWindowsPath(os_stream_path) + self.assertEqual(len(res), 1) trace = res[0] streams = sorted(trace["streams"], key=sort_predictably) self.assertEqual(len(streams), 2) self.assertRegexpMatches( str(streams[0]["port-name"]), - r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_0$", + r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*" + + re.escape(str(os_stream_path / "test_stream_0")) + + r"$", ) self.assertRegexpMatches( str(streams[1]["port-name"]), - r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_1$", + r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*" + + re.escape(str(os_stream_path / "test_stream_1")) + + r"$", ) def test_trace_uuid_no_stream_class_id_no_stream_id(self): @@ -171,13 +183,22 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): "trace-info", {"paths": [os.path.join(test_ctf_traces_path, "succeed", "succeed1")]}, ) + + os_stream_path = PurePosixPath( + '/tests/data/ctf-traces/succeed/succeed1/dummystream' + ) + if os.environ['BT_OS_TYPE'] == 'mingw': + os_stream_path = PureWindowsPath(os_stream_path) + self.assertEqual(len(res), 1) trace = res[0] streams = sorted(trace["streams"], key=sort_predictably) self.assertEqual(len(streams), 1) self.assertRegexpMatches( str(streams[0]["port-name"]), - r"^2a6422d0-6cee-11e0-8c08-cb07d7b3a564 \| .*/tests/data/ctf-traces/succeed/succeed1/dummystream$", + r"^2a6422d0-6cee-11e0-8c08-cb07d7b3a564 \| .*" + + re.escape(str(os_stream_path)) + + r"$", )