diff options
Diffstat (limited to 'test/cases/librerelease.bats')
-rw-r--r-- | test/cases/librerelease.bats | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/cases/librerelease.bats b/test/cases/librerelease.bats index ce9692f..e936ea8 100644 --- a/test/cases/librerelease.bats +++ b/test/cases/librerelease.bats @@ -109,7 +109,7 @@ teardown() { sub/subfolder eot - diff "$tmpdir/list-correct" "$tmpdir/list" + diff -u "$tmpdir/list-correct" "$tmpdir/list" } @test "librerelease fails if GPGKEY not set" { @@ -165,7 +165,7 @@ eot [[ $status == 0 ]] grep "==> Removing files from local staging directory" "$tmpdir"/stderr - diff "$tmpdir"/expected-stdout "$tmpdir"/stdout + diff -u "$tmpdir"/expected-stdout "$tmpdir"/stdout (( ! $(command ls -A1 "$staging_dir" | wc -l) )) } @@ -186,7 +186,11 @@ eot [[ $status == 0 ]] grep "==> Removing files from remote staging directory" "$tmpdir"/stderr - diff "$tmpdir"/expected-stdout "$tmpdir"/stdout + # `rm -rfv` order depends on the underlying filesystem and so + # we need to sort this for it to be reproducible. + LC_ALL=C sort <"$tmpdir"/expected-stdout >"$tmpdir"/expected-stdout.sorted + LC_ALL=C sort <"$tmpdir"/stdout >"$tmpdir"/stdout.sorted + diff -u "$tmpdir"/expected-stdout.sorted "$tmpdir"/stdout.sorted (( ! $(command ls -A1 "$staging_dir" | wc -l) )) } |