Merge lp:~nskaggs/juju-ci-tools/grant-revoke-debug into lp:juju-ci-tools

[Nicholas Skaggs]

Fix grant revoke based on CI outcomes

[lp:~nskaggs/juju-ci-tools/grant-revoke-debug]

1377. By Nicholas Skaggs on 2016-05-13

flake8 too

1378. By Nicholas Skaggs on 2016-05-13

fix tests

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'assess_user_grant_revoke.py'
--- assess_user_grant_revoke.py	2016-05-10 17:50:04 +0000
+++ assess_user_grant_revoke.py	2016-05-13 16:48:39 +0000
@@ -24,6 +24,7 @@
 from utility import (
     add_basic_testing_arguments,
     configure_logging,
+    scoped_environ,
     temp_dir,
 )
 
@@ -42,21 +43,23 @@
                   register_process=pexpect.spawn):
     # needs support to passing register command with arguments
     # refactor once supported, bug 1573099
-    try:
-        child = register_process(register_cmd, env=environ)
-        child.expect('(?i)name .*: ')
-        child.sendline(username + '_controller')
-        child.expect('(?i)password')
-        child.sendline(username + '_password')
-        child.expect('(?i)password')
-        child.sendline(username + '_password')
-        child.expect(pexpect.EOF)
-        if child.isalive():
+    # pexpect has a bug, and doesn't honor env=
+    with scoped_environ(environ):
+        try:
+            child = register_process(register_cmd)
+            child.expect('(?i)name .*: ')
+            child.sendline(username + '_controller')
+            child.expect('(?i)password')
+            child.sendline(username + '_password')
+            child.expect('(?i)password')
+            child.sendline(username + '_password')
+            child.expect(pexpect.EOF)
+            if child.isalive():
+                raise JujuAssertionError(
+                    'Registering user failed: pexpect session still alive')
+        except pexpect.TIMEOUT:
             raise JujuAssertionError(
-                'Registering user failed: pexpect session still alive')
-    except pexpect.TIMEOUT:
-        raise JujuAssertionError(
-            'Registering user failed: pexpect session timed out')
+                'Registering user failed: pexpect session timed out')
 
 
 def create_cloned_environment(client, cloned_juju_home):
@@ -86,13 +89,13 @@
 def assert_write(client, permission):
     if permission:
         try:
-            client.deploy('local:wordpress')
+            client.deploy('cs:ubuntu')
         except subprocess.CalledProcessError:
             raise JujuAssertionError(
                 'User could not deploy with write permission')
     else:
         try:
-            client.deploy('local:wordpress')
+            client.deploy('cs:ubuntu')
         except subprocess.CalledProcessError:
             pass
         else:

=== modified file 'tests/test_assess_user_grant_revoke.py'
--- tests/test_assess_user_grant_revoke.py	2016-05-10 17:50:04 +0000
+++ tests/test_assess_user_grant_revoke.py	2016-05-13 16:48:39 +0000
@@ -38,7 +38,7 @@
     def get_process(cls, username, expected_strings):
         return partial(cls, username, expected_strings)
 
-    def __init__(self, sendline_str, expected_str, register_cmd, env):
+    def __init__(self, sendline_str, expected_str, register_cmd):
         self._expect_strings = iter(expected_str)
         self._sendline_strings = iter(sendline_str)
 
@@ -178,17 +178,18 @@
     def test_create_cloned_environment(self):
         fake_client = FakeJujuClient()
         fake_client.bootstrap()
-        fake_client_env = fake_client._shell_environ()
-        cloned, cloned_env = create_cloned_environment(fake_client, 'fakehome')
+        fake_client_environ = fake_client._shell_environ()
+        cloned, cloned_environ = create_cloned_environment(fake_client,
+                                                           'fakehome')
         self.assertIs(FakeJujuClient, type(cloned))
         self.assertEqual(cloned.env.juju_home, 'fakehome')
-        self.assertNotEqual(cloned_env, fake_client_env)
-        self.assertEqual(cloned_env['JUJU_DATA'], 'fakehome')
+        self.assertNotEqual(cloned_environ, fake_client_environ)
+        self.assertEqual(cloned_environ['JUJU_DATA'], 'fakehome')
 
     def test_register_user(self):
         username = 'fakeuser'
         fake_client = FakeJujuClient()
-        env = fake_client._shell_environ()
+        environ = fake_client._shell_environ()
         cmd = 'juju register AaBbCc'
 
         register_process = RegisterUserProcess.get_process(
@@ -206,4 +207,5 @@
             ]
         )
 
-        register_user(username, env, cmd, register_process=register_process)
+        register_user(username, environ, cmd,
+                      register_process=register_process)