diff --git a/go.mod b/go.mod index a6fe6a7..a482585 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/kr/pretty v0.3.0 - github.com/rogpeppe/go-internal v1.8.1 + github.com/rogpeppe/go-internal v1.9.0 github.com/schollz/progressbar/v3 v3.13.0 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ) diff --git a/go.sum b/go.sum index db4d15d..7befc16 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/schollz/progressbar/v3 v3.13.0 h1:9TeeWRcjW2qd05I8Kf9knPkW4vLM/hYoa6z9ABvxje8= github.com/schollz/progressbar/v3 v3.13.0/go.mod h1:ZBYnSuLAX2LU8P8UiKN/KgF2DY58AJC8yfVYLPC8Ly4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/testdata/scripts/cmds.txt b/testdata/scripts/cmds.txt index 7ac78bb..d363754 100644 --- a/testdata/scripts/cmds.txt +++ b/testdata/scripts/cmds.txt @@ -29,3 +29,21 @@ stderr 'When given no arguments' ! fdroidcl install -u some.app stderr 'without arguments' + +! fdroidcl clean a b +stderr 'wrong amount of arguments' + +! fdroidcl clean a +stderr 'pass either index or cache as parameter, or no parameter at all' + +fdroidcl clean index +stdout 'Cleaned index\.' +! stderr . + +fdroidcl clean cache +stdout 'Cleaned cache\.' +! stderr . + +fdroidcl clean +stdout 'Cleaned index and cache\.' +! stderr . diff --git a/testdata/scripts/device.txt b/testdata/scripts/device.txt index 4950845..8fa7a76 100644 --- a/testdata/scripts/device.txt +++ b/testdata/scripts/device.txt @@ -32,7 +32,7 @@ stdout 'install org\.vi_server\.red_screen:1' # install version code 1 fdroidcl install org.vi_server.red_screen:1 stdout 'Downloading.*red_screen_1.apk' -stdout 'done' +stdout '100%' stdout 'Installing' # app shows up as installed and upgradable @@ -46,7 +46,7 @@ stdout 'install org\.vi_server\.red_screen:2' # upgrade app to version code 2 fdroidcl install org.vi_server.red_screen stdout 'Downloading.*red_screen_2.apk' -stdout 'done' +stdout '100%' stdout 'Installing' # app does not show up as upgradable diff --git a/testdata/scripts/download.txt b/testdata/scripts/download.txt index ebbc67b..7fff6f0 100644 --- a/testdata/scripts/download.txt +++ b/testdata/scripts/download.txt @@ -3,6 +3,6 @@ env HOME=$WORK/home fdroidcl update fdroidcl download org.vi_server.red_screen -stdout 'Downloading.*red_screen_2.apk' -stdout 'done' +stdout 'red_screen_2.apk' +stdout '100%' stdout 'APK available in .*fdroidcl.*apks.*red_screen_2.apk$' diff --git a/testdata/scripts/show.txt b/testdata/scripts/show.txt index 1aeda47..d9833ba 100644 --- a/testdata/scripts/show.txt +++ b/testdata/scripts/show.txt @@ -14,4 +14,4 @@ fdroidcl show org.pocketworkstation.pckeyboard info.metadude.android.bitsundbaeu ! stdout '&apos' ! stdout '&' stdout 'Name.*Hacker''s Keyboard' -stdout 'Version.*Bits & Bäume' +stdout 'Version.*Bits-und-Baeume' diff --git a/testdata/scripts/update.txt b/testdata/scripts/update.txt index 615dc21..ce6744e 100644 --- a/testdata/scripts/update.txt +++ b/testdata/scripts/update.txt @@ -4,7 +4,7 @@ env HOME=$WORK/home stderr 'index does not exist' fdroidcl update -stdout 'done' +stdout '100%' fdroidcl update stdout 'not modified'