Merge lp:~veebers/juju-ci-tools/flyby-cleanup-jimm-remove-try into lp:juju-ci-tools

[Christopher Lee]

Remove try/except/TIMEOUT from register_host as the raised exception is useful as is.

Remove try/except/TIMEOUT from register_host as the raised exception is useful as is.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'jujupy/client.py'
--- jujupy/client.py	2017-03-01 19:02:24 +0000
+++ jujupy/client.py	2017-03-02 04:22:47 +0000
@@ -2650,26 +2650,21 @@
     def register_host(self, host, email, password):
         child = self.expect('register', ('--no-browser-login', host),
                             include_e=False)
-        try:
-            child.logfile = sys.stdout
-            child.expect('E-Mail:|Enter a name for this controller:')
-            if child.match.group(0) == 'E-Mail:':
-                child.sendline(email)
-                child.expect('Password:')
-                child.logfile = None
-                try:
-                    child.sendline(password)
-                finally:
-                    child.logfile = sys.stdout
-                child.expect(r'Two-factor auth \(Enter for none\):')
-                child.sendline()
-                child.expect('Enter a name for this controller:')
-            child.sendline(self.env.controller.name)
-            child.expect(pexpect.EOF)
-        except pexpect.TIMEOUT:
-            raise
-            raise Exception(
-                'Registering user failed: pexpect session timed out')
+        child.logfile = sys.stdout
+        child.expect('E-Mail:|Enter a name for this controller:')
+        if child.match.group(0) == 'E-Mail:':
+            child.sendline(email)
+            child.expect('Password:')
+            child.logfile = None
+            try:
+                child.sendline(password)
+            finally:
+                child.logfile = sys.stdout
+            child.expect(r'Two-factor auth \(Enter for none\):')
+            child.sendline()
+            child.expect('Enter a name for this controller:')
+        child.sendline(self.env.controller.name)
+        child.expect(pexpect.EOF)
 
     def remove_user(self, username):
         self.juju('remove-user', (username, '-y'), include_e=False)