diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-07-22 16:03:14 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-07-22 16:03:14 +0000 |
| commit | a934314cbdc56e30c77f554cd21772e5fbd306c3 (patch) | |
| tree | 17a24cd47582c5392c09e0a115fbd78ba62272b0 | |
| parent | 03ae8a519f7d2af7907d7c725c0fdaebce827d19 (diff) | |
| parent | 9e8d08de565c5e04b802c015e21ee7573f7746c6 (diff) | |
| download | lorry-a934314cbdc56e30c77f554cd21772e5fbd306c3.tar.gz | |
Merge branch 'bwh/fix-cvs-test-failure' into 'master'
tests: Fix flaky cvs-single-commit test
Closes #6
See merge request CodethinkLabs/lorry/lorry!11
| -rwxr-xr-x | tests/cvs-single-commit.setup | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/cvs-single-commit.setup b/tests/cvs-single-commit.setup index 537de81..1f0ef43 100755 --- a/tests/cvs-single-commit.setup +++ b/tests/cvs-single-commit.setup @@ -38,6 +38,10 @@ cd "$workingcopy" cvs checkout CVSROOT cd "$workingcopy/CVSROOT" +# ensure that our commit has a later timestamp than cvs init's +# "initial checkin" +sleep 1 + # add the test file echo "first line" > test.txt cvs -Q add test.txt |