Mesa (master): ci: Split test_tracie_skips_traces_without_checksum in separate cases

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e85dc9a240601a201ec662f1a17bbdbea2965bfd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e85dc9a240601a201ec662f1a17bbdbea2965bfd

Author: Pablo Saavedra <psaavedra at igalia.com>
Date:   Wed May 13 20:48:32 2020 +0200

ci: Split test_tracie_skips_traces_without_checksum in separate cases

test_tracie_skips_traces_without_checksum does the logic previous to
the commit 8546d1dd789b58bd0aff5ca0a231efb35c09c1ac. The traces.yml includes
several traces, only the one without checksum is ignored by tracie.

As a complementary action, this change adds an new test
(test_tracie_only_traces_without_checksum) to verify the behavior for
cases where the traces.yml only contains traces without checksum.

Finally, test_tracie_skips_traces_without_checksum is renamed as
test_tracie_traces_with_and_without_checksum

Signed-off-by: Pablo Saavedra <psaavedra at igalia.com>
Reviewed-by: Andres Gomez <agomez at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4916>

---

 .gitlab-ci/tracie/tests/test.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/tracie/tests/test.py b/.gitlab-ci/tracie/tests/test.py
index f8c55cae985..40b1a45d3f5 100644
--- a/.gitlab-ci/tracie/tests/test.py
+++ b/.gitlab-ci/tracie/tests/test.py
@@ -129,7 +129,24 @@ def test_tracie_fails_on_image_mismatch():
     assert check_results_yaml_content(RESULTS_YAML, expectations)
 
 
-def test_tracie_skips_traces_without_checksum():
+def test_tracie_traces_with_and_without_checksum():
+    filename = "./tests/traces.yml"
+    content = read_from(filename)
+    content += '''  - path: trace1/red.testtrace
+    expectations:
+    - device: bla
+      checksum: 000000000000000'''
+    write_to(content, filename)
+
+    # red.testtrace should be skipped, since it doesn't
+    # have any checksums for our device
+    filename = "./traces-db/trace1/red.testtrace"
+    content = "ff0000ff"
+    write_to(content, filename)
+    assert run_tracie()
+
+
+def test_tracie_only_traces_without_checksum():
     filename = "./tests/traces.yml"
     content = '''traces:
   - path: trace1/red.testtrace