From b09bdddabe80b2592ec3358c4a463ebeb23739fd Mon Sep 17 00:00:00 2001 From: Brandon Hong Date: Fri, 19 Jul 2019 11:01:13 +0800 Subject: [PATCH] Update testcases to reflect new info format Signed-off-by: Brandon Hong --- test/functional/mirror/mirror-createdir-negative.bats | 2 ++ test/functional/mirror/mirror-createdir.bats | 3 +++ test/functional/mirror/mirror-json.bats | 1 + test/functional/usability/usa-config-file.bats | 3 +++ 4 files changed, 9 insertions(+) diff --git a/test/functional/mirror/mirror-createdir-negative.bats b/test/functional/mirror/mirror-createdir-negative.bats index e0007354..c0f4fa64 100755 --- a/test/functional/mirror/mirror-createdir-negative.bats +++ b/test/functional/mirror/mirror-createdir-negative.bats @@ -38,6 +38,7 @@ global_teardown() { expected_output=$(cat <<-EOM .*/etc/swupd: not a directory Warning: Unable to set mirror url + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: file://.*/web-dir Content URL: file://.*/web-dir @@ -59,6 +60,7 @@ global_teardown() { expected_output=$(cat <<-EOM .*/etc/swupd: not a directory Warning: Unable to set mirror url + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: file://.*/web-dir Content URL: file://.*/web-dir diff --git a/test/functional/mirror/mirror-createdir.bats b/test/functional/mirror/mirror-createdir.bats index 2d862e9d..da3620c8 100755 --- a/test/functional/mirror/mirror-createdir.bats +++ b/test/functional/mirror/mirror-createdir.bats @@ -34,6 +34,7 @@ global_teardown() { assert_status_is 0 expected_output=$(cat <<-EOM Set upstream mirror to https://example.com/swupd-file + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: https://example.com/swupd-file Content URL: https://example.com/swupd-file @@ -54,6 +55,7 @@ global_teardown() { assert_status_is 0 expected_output=$(cat <<-EOM Set upstream mirror to https://example.com/swupd-file + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: https://example.com/swupd-file Content URL: https://example.com/swupd-file @@ -75,6 +77,7 @@ global_teardown() { assert_status_is 0 expected_output=$(cat <<-EOM Set upstream mirror to https://example.com/swupd-file + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: https://example.com/swupd-file Content URL: https://example.com/swupd-file diff --git a/test/functional/mirror/mirror-json.bats b/test/functional/mirror/mirror-json.bats index 5733f808..d6bc004f 100755 --- a/test/functional/mirror/mirror-json.bats +++ b/test/functional/mirror/mirror-json.bats @@ -27,6 +27,7 @@ test_setup() { { "type" : "info", "msg" : "The --allow-insecure-http flag was used, be aware that this poses a threat to the system " }, { "type" : "warning", "msg" : "The mirror was set up using HTTP. In order for autoupdate to continue working you will need to set allow_insecure_http=true in the swupd configuration file. Alternatively you can set the mirror using HTTPS (recommended) " }, { "type" : "info", "msg" : "Set upstream mirror to http://example.com/swupd-file " }, + { "type" : "info", "msg" : "Distribution: Clear Linux Software for Intel Architecture " }, { "type" : "info", "msg" : "Installed version: 10 " }, { "type" : "info", "msg" : "Version URL: http://example.com/swupd-file " }, { "type" : "info", "msg" : "Content URL: http://example.com/swupd-file " }, diff --git a/test/functional/usability/usa-config-file.bats b/test/functional/usability/usa-config-file.bats index 13934002..8756ee28 100755 --- a/test/functional/usability/usa-config-file.bats +++ b/test/functional/usability/usa-config-file.bats @@ -170,6 +170,7 @@ global_teardown() { run sudo sh -c "$SWUPD info $SWUPD_OPTS -v http://anotherurl.com" assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: http://anotherurl.com Content URL: http://someurl.com @@ -205,6 +206,7 @@ global_teardown() { run sudo sh -c "$SWUPD info $SWUPD_OPTS" assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: file://$TEST_DIRNAME/web-dir Content URL: file://$TEST_DIRNAME/web-dir @@ -225,6 +227,7 @@ global_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Warning: Unrecognized option 'invalid_option=true' from section [global] in the configuration file + Distribution: Clear Linux Software for Intel Architecture Installed version: 10 Version URL: file://$TEST_DIRNAME/web-dir Content URL: file://$TEST_DIRNAME/web-dir