summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2019-11-26 10:40:34 +0100
committerJürg Billeter <j@bitron.ch>2019-12-17 14:18:11 +0100
commit0e740fabd9ef0ad3b7c32669d2b3cd4a6cf4ae57 (patch)
tree58ab24bb240730a5893db535c36bbcd72e51be4f
parent7ffd9a7ebf417624d948117938ecda26e87bbbd2 (diff)
downloadbuildstream-0e740fabd9ef0ad3b7c32669d2b3cd4a6cf4ae57.tar.gz
tests: source_determinism.py: Skip flaky test with buildbox-run
The tests are flaky due to non-deterministic timestamps in the output of `ls -l`. See https://gitlab.com/BuildStream/buildstream/issues/1218
-rw-r--r--src/buildstream/testing/_sourcetests/source_determinism.py4
-rw-r--r--tests/integration/source-determinism.py4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/buildstream/testing/_sourcetests/source_determinism.py b/src/buildstream/testing/_sourcetests/source_determinism.py
index d51d0e520..ed00c71ea 100644
--- a/src/buildstream/testing/_sourcetests/source_determinism.py
+++ b/src/buildstream/testing/_sourcetests/source_determinism.py
@@ -50,6 +50,10 @@ def create_test_directory(*path, mode=0o644):
@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
+@pytest.mark.skipif(
+ HAVE_SANDBOX == "buildbox-run" and CASD_SEPARATE_USER,
+ reason="Flaky due to timestamps: https://gitlab.com/BuildStream/buildstream/issues/1218",
+)
def test_deterministic_source_umask(cli, tmpdir, datafiles, kind):
project = str(datafiles)
element_name = "list.bst"
diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py
index 14559759d..355588133 100644
--- a/tests/integration/source-determinism.py
+++ b/tests/integration/source-determinism.py
@@ -29,6 +29,10 @@ def create_test_directory(*path, mode=0o644):
@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
+@pytest.mark.skipif(
+ HAVE_SANDBOX == "buildbox-run" and CASD_SEPARATE_USER,
+ reason="Flaky due to timestamps: https://gitlab.com/BuildStream/buildstream/issues/1218",
+)
def test_deterministic_source_local(cli, tmpdir, datafiles):
"""Only user rights should be considered for local source.
"""