Relax juju register controller name promp message regex;

benhoyt · Oct 28, 2020 · f231664 · f231664
1 parent cb95d70
commit f231664
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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: