From 0019062ff0f64b549f3d5c7ddcb3635e0440a6ab Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Thu, 31 Oct 2019 12:57:25 +0100 Subject: Make the scrape script robust enough, again The script scrape_testresults.py analyzes log files in order to find embedded script files for the registry. This script does not try to be absolute water-proof but handled the existing cases well. By chance, the text "BEGIN_FILE", which is used as an indicator, was found in a traceback from the generating script. We modified the search to ignore this text in single quotes, but also changed the originating file testing/runner.py to no longer contain this text in the future. Change-Id: I1fef1cf5e9b85fc94b7ee52edbdf4afa4bf4e35a Reviewed-by: Friedemann Kleint --- sources/pyside2/tests/registry/scrape_testresults.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sources') diff --git a/sources/pyside2/tests/registry/scrape_testresults.py b/sources/pyside2/tests/registry/scrape_testresults.py index 4c2e37129..2e8f9c953 100644 --- a/sources/pyside2/tests/registry/scrape_testresults.py +++ b/sources/pyside2/tests/registry/scrape_testresults.py @@ -246,7 +246,9 @@ def handle_suburl(idx, n, url, level): test_name = sub_url.split("/")[-2] print(os.getpid(), test_name) response = read_url(sub_url) - if response and "BEGIN_FILE" in response.text: + txt = response.text if response else '' + if "BEGIN_FILE" in txt and not "'BEGIN_FILE'" in txt: + # find the text, but not a traceback with that text print(os.getpid(), test_name, "FOUND!") write_data(test_name, response.text) else: -- cgit v1.2.3