diff options
| author | Bryan Quigley <bryan.quigley@canonical.com> | 2020-03-16 09:46:01 -0700 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2020-03-18 09:53:13 -0400 |
| commit | 9b23b23c2d76a32c3ebeaad68b2c1257dbd4fced (patch) | |
| tree | ea665e2b643623e3513a87d414ab2941f10e8eee | |
| parent | 6164d2f15bf94246a68c5dc48529975903c1aa6c (diff) | |
| download | sos-9b23b23c2d76a32c3ebeaad68b2c1257dbd4fced.tar.gz | |
[tests] Make simple.sh consistent
We no longer have to workaround an odd LXD/Travis interaction
so make simple.sh not treat Travis special.
Closes: #1921
Resolves: #1983
Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rwxr-xr-x | tests/simple.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/simple.sh b/tests/simple.sh index feaa6252..2a6b7a1c 100755 --- a/tests/simple.sh +++ b/tests/simple.sh @@ -11,7 +11,6 @@ # * look into using a framework.. # * why --dry-run fails? # * why --experimental fails? -# * https://github.com/sosreport/sos/issues/1921 # * make it better validate archives and contents PYTHON=${1:-/usr/bin/python3} @@ -93,14 +92,7 @@ run_expecting_sucess " --batch --build --no-env-vars " # Only --build test run_expecting_sucess " --batch --no-report -o hardware " extract run_expecting_sucess " --batch --label TEST -a -c never" extract run_expecting_sucess " --batch --debug --log-size 0 -c always" extract - -# Workaround Travis bug (requires -n lxd) -if [ $TRAVIS = true ]; then - run_expecting_sucess " --batch -z xz --log-size 1 -n lxd" extract -else - run_expecting_sucess " --batch -z xz --log-size 1" extract -fi - +run_expecting_sucess " --batch -z xz --log-size 1" extract run_expecting_sucess " --batch -z gzip" extract run_expecting_sucess " --batch -z bzip2 -t 1 -n hardware" extract run_expecting_sucess " --batch --quiet -e opencl -k kernel.with-timer" extract |