From f231664fa504abb1dc1530b098aa439ad0368d08 Mon Sep 17 00:00:00 2001 From: Kelvin Liu Date: Wed, 28 Oct 2020 16:59:25 +1000 Subject: [PATCH] Relax juju register controller name promp message regex; --- acceptancetests/assess_cross_model_relations.py | 5 ++--- acceptancetests/jujupy/client.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/acceptancetests/assess_cross_model_relations.py b/acceptancetests/assess_cross_model_relations.py index f799e7c1e99..7f54d5740df 100755 --- a/acceptancetests/assess_cross_model_relations.py +++ b/acceptancetests/assess_cross_model_relations.py @@ -63,9 +63,8 @@ def assess_cross_model_relations_single_controller(args): with bs_manager.booted_context(args.upload_tools): offer_model = bs_manager.client with temporary_model(offer_model, 'consume-model') as consume_model: - ensure_cmr_offer_management(offer_model) - ensure_cmr_offer_consumption_and_relation( - offer_model, consume_model) + ensure_cmr_offer_management(offer_model) + ensure_cmr_offer_consumption_and_relation(offer_model, consume_model) def assess_cross_model_relations_multiple_controllers(args): diff --git a/acceptancetests/jujupy/client.py b/acceptancetests/jujupy/client.py index bb2516ce5d0..8909391b874 100644 --- a/acceptancetests/jujupy/client.py +++ b/acceptancetests/jujupy/client.py @@ -2387,7 +2387,7 @@ def register_user_interactively(client, token, controller_name): child.sendline(client.env.user_name + '_password') child.expect(u'Confirm password:') child.sendline(client.env.user_name + '_password') - child.expect(u'Enter a name for this controller \[.*\]:') + child.expect(u'Enter a name for this controller( \[.*\])?:') child.sendline(controller_name) client._end_pexpect_session(child) except pexpect.TIMEOUT: