[JUJU-1198] Rewrite to bash-based nw-destroy-model-lxd #14436
Conversation
tests/suites/model/destroy.sh
Outdated
|
|
||
| echo "Destroy model 'model-new'" | ||
| destroy_model "model-new" | ||
| juju switch :model-destroy |
There was a problem hiding this comment.
We technically don't need the colon here
And also, this is incorrect I believe. The original test asserts that if the active model is destroyed, you are automatically switched to another
There was a problem hiding this comment.
I agreed about the colon. But I've concerns about automatic switching:
https://pastebin.canonical.com/p/99Y9R7jQ7b/
Here is the origin (python-based) test:
juju/acceptancetests/assess_destroy_model.py
Lines 47 to 53 in 137a772
| juju models --format json | jq -r '."current-model"' | check model-destroy | ||
|
|
||
| destroy_model "model-destroy" | ||
| } |
There was a problem hiding this comment.
One small bit of coverage missing
juju/acceptancetests/assess_destroy_model.py
Lines 68 to 70 in ac9ddca
The python based test ensures that the created model can't be found
There was a problem hiding this comment.
destroy_model "model-new"
is_destroyed=$(juju models --format json | jq -r '.models[] | select(."short-name" == "model-new")')
if [[ -z ${is_destroyed} ]]; then is_destroyed=true; fi
check_contains "${is_destroyed}" trueAdded explicit model deletion check.
|
/merge |
#14488 ``` Merge branch '2.9' into develop # Conflicts: # .github/workflows/smoke.yml # apiserver/common/tools_test.go # apiserver/facades/client/application/application_unit_test.go # apiserver/facades/client/application/mock_test.go # apiserver/facades/client/application/package_test.go # apiserver/facades/client/cloud/cloudV2_test.go # apiserver/facades/client/cloud/cloud_test.go # caas/kubernetes/provider/application/application.go # cmd/juju/commands/upgradecontroller_test.go # cmd/juju/commands/upgrademodel.go # cmd/juju/commands/upgrademodel_test.go # cmd/juju/controller/kill.go # go.mod # go.sum # scripts/win-installer/setup.iss # snap/snapcraft.yaml # tests/suites/deploy/bundles/lxd-profile-bundle.yaml # tests/suites/deploy/bundles/telegraf_bundle.yaml # tests/suites/deploy/bundles/trusted_bundle.yaml # tests/suites/deploy/deploy_charms.sh # tests/suites/network/network_health.sh # tests/suites/ovs_maas/ovs_netplan_config.sh # tests/suites/spaces_ec2/juju_bind.sh # tests/suites/spaces_ec2/upgrade_charm_with_bind.sh # tests/suites/upgrade/streams.sh # upgrades/operations.go # upgrades/upgrade_test.go # version/version.go ``` Includes PRs: - #14424 - #14428 - #14430 - #14431 - #14427 - #14433 - #14434 - #14437 - #14439 - #14440 - #14442 - #14445 - #14446 - #14444 - #14448 - #14453 - #14436 - #14459 - #14462 - #14458 - #14418 - #14419 - #14463 - #14464 - #14455 - #14449 - #14465 - #14470 - #14473 - #14476 - #14468 - #14383 - #14483
anvial
deleted the
JUJU-1198-rewrite-to-bash-based-nw-destroy-model-lxd
branch
This patch adds destroy model test to the model suite in bash-based tests.
Original (python-based) tests live here.
Checklist
[ ] Go unit tests, with comments saying what you're testing[ ] Integration tests, with comments saying what you're testing[ ] doc.go added or updated in changed packagesQA steps
cd tests ./main.sh -v -p lxd model test_model_destroy