summaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2019-12-30 08:47:19 +0000
committerJürg Billeter <j@bitron.ch>2020-02-05 16:11:32 +0100
commit8bb98fde8d4862b2d450f76cecb16db5e1868650 (patch)
treecb10f742298dea3249070a5637fac6006ca74d7c /tests/integration
parent546b3c1a46b6850ad182ebefcae9e70237a1186b (diff)
downloadbuildstream-8bb98fde8d4862b2d450f76cecb16db5e1868650.tar.gz
tests: Avoid testing file times along with umask
Avoids testing for file times when testing for umask. These tests are known to be flaky and are overly specific in that they implicitly test more than just umask.
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/source-determinism.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py
index 355588133..a69e55a23 100644
--- a/tests/integration/source-determinism.py
+++ b/tests/integration/source-determinism.py
@@ -29,10 +29,6 @@ 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.
"""
@@ -62,6 +58,7 @@ def test_deterministic_source_local(cli, tmpdir, datafiles):
create_test_directory(sourcedir, "dir-c", mode=0o2755 & mask)
create_test_directory(sourcedir, "dir-d", mode=0o1755 & mask)
try:
+ test_values = []
result = cli.run(project=project, args=["build", element_name])
result.assert_success()
@@ -69,7 +66,9 @@ def test_deterministic_source_local(cli, tmpdir, datafiles):
result.assert_success()
with open(os.path.join(checkoutdir, "ls-l"), "r") as f:
- return f.read()
+ for line in f.readlines():
+ test_values.append(line.split()[0] + " " + line.split()[-1])
+ return test_values
finally:
cli.remove_artifact_from_cache(project, element_name)