From 4f1418aa4e0eb26e0bc1bd8ffab7b0b1d022c61a Mon Sep 17 00:00:00 2001 From: Harry Pidcock Date: Fri, 26 May 2023 13:34:08 +1000 Subject: [PATCH] Fix test-branch by using a simple charm. --- tests/suites/branches/branches.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/suites/branches/branches.sh b/tests/suites/branches/branches.sh index 77d4eaae748..4f402637387 100644 --- a/tests/suites/branches/branches.sh +++ b/tests/suites/branches/branches.sh @@ -1,3 +1,5 @@ +# Simple test to check if branches work with application configuration +# and can be created, set, read back and commited. run_branch() { # Echo out to ensure nice output to the test suite. echo @@ -8,19 +10,19 @@ run_branch() { juju branch | check 'Active branch is "master"' - juju deploy mongodb --channel 3.6/stable + juju deploy juju-qa-dummy-source --series jammy --config token=a - wait_for "mongodb" "$(idle_condition "mongodb")" + wait_for "dummy-source" "$(idle_condition "dummy-source")" juju add-branch test-branch juju branch | check 'Active branch is "test-branch"' - juju config mongodb replicaset=newset --branch test-branch - check_config_command "juju config mongodb replicaset --branch test-branch" "newset" - check_config_command "juju config mongodb replicaset --branch master" "myset" + juju config dummy-source token=b --branch test-branch + check_config_command "juju config dummy-source token --branch test-branch" "b" + check_config_command "juju config dummy-source token --branch master" "a" juju commit test-branch | check 'Active branch set to "master"' - check_config_command "juju config mongodb replicaset" "newset" + check_config_command "juju config dummy-source token" "b" # Clean up! destroy_model "branches"