WIP: Start work on moving display clouds to an integration test.

juju · Jan 6, 2020 · 40dfedb · 40dfedb
1 parent 12db207
commit 40dfedb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/tests/suites/cli/clouds/public-cloud.yml b/tests/suites/cli/clouds/public-cloud.yml
diff --git a/tests/suites/cli/display_clouds.sh b/tests/suites/cli/display_clouds.sh
@@ -0,0 +1,25 @@
+run_show_clouds() {
+  echo
+
+  touch "${TEST_DIR}/public-clouds.yaml"
+
+  OUT=$(XDG_DATA_HOME="${TEST_DIR}" juju clouds --local --format=json 2>/dev/null)
+  if [ -n "${OUT}" ]; then
+    echo "expected empty ${OUT}"
+  fi
+}
+
+test_display_clouds() {
+  if [ "$(skip 'test_display_clouds')" ]; then
+    echo "==> TEST SKIPPED: display clouds"
+    return
+  fi
+
+  (
+    set_verbosity
+
+    cd .. || exit
+
+    run "run_show_clouds"
+  )
+}
diff --git a/tests/suites/cli/use_local_charm.sh → tests/suites/cli/local_charms.sh b/tests/suites/cli/use_local_charm.sh → tests/suites/cli/local_charms.sh
diff --git a/tests/suites/cli/task.sh b/tests/suites/cli/task.sh
@@ -9,11 +9,12 @@ test_cli() {
     echo "==> Checking for dependencies"
     check_dependencies juju
 
-    file="${TEST_DIR}/test-local-charms.txt"
+    file="${TEST_DIR}/test-cli.txt"
 
-    bootstrap "test-local-charms" "${file}"
+    bootstrap "test-cli" "${file}"
 
+    test_display_clouds
     test_local_charms
 
-    destroy_controller "test-local-charms"
+    destroy_controller "test-cli"
 }