Merge ~barryprice/charm-test/+git/charm-test:master into charm-test:master

[Barry Price]

Separate juju's -y flag from the controller:model we want to destroy. Otherwise:

INFO 2018-06-07 19:59:28.760091 Running command "juju destroy-model -ylxd:charm-test" in container "charm-test" as ubuntu
ERROR no model specified

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Whoops. Yeah, that.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 018076655f08381fa2051c7caaf939f8937a74ec

diff --git a/charm_test.py b/charm_test.py
index 97be0ca..06ef103 100755
--- a/charm_test.py
+++ b/charm_test.py
@@ -117,7 +117,7 @@ def run_tests(args):
 
 def clean_up(args):
     print_log("Cleaning up")
-    lxc_run_as_ubuntu(["juju", "destroy-model", "-y" "{}:{}".format(args.controller_name, args.juju_model_name)],
+    lxc_run_as_ubuntu(["juju", "destroy-model", "-y", "{}:{}".format(args.controller_name, args.juju_model_name)],
                       args)
     lxc_delete = subprocess.check_output(['lxc', 'delete', '--force', args.container_name], universal_newlines=True)
     if lxc_delete: