Merge lp:~elopio/ubuntu-autopilot-tests/initctl_env_from_toolkit into lp:ubuntu-autopilot-tests/ubuntu-experience-tests

[Leo Arias]

Update the environment to use the helpers from the toolkit.

[lp:~elopio/ubuntu-autopilot-tests/initctl_env_from_toolkit]

17. By Leo Arias on 2014-05-13

fixed flake8.

18. By Leo Arias on 2014-05-13

Take into account that the env var might not be set.

19. By Leo Arias on 2014-05-13

Typo.

[Richard Huddie (rhuddie)]

review: Approve

=== modified file 'ubuntu_experience_tests/fixture_setup.py'
--- ubuntu_experience_tests/fixture_setup.py	2014-03-10 12:55:24 +0000
+++ ubuntu_experience_tests/fixture_setup.py	2014-05-13 14:37:56 +0000
@@ -20,34 +20,11 @@
 """Set up and clean up fixtures for the Inter-app integration tests."""
 
 
-import fixtures
-import subprocess
-
-
-class TestabilityEnvironment(fixtures.Fixture):
-
-    def setUp(self):
-        super(TestabilityEnvironment, self).setUp()
-        self._set_testability_environment_variable()
-        self.addCleanup(self._reset_environment_variable)
-
-    def _set_testability_environment_variable(self):
-        """Make sure every app loads the testability driver."""
-        subprocess.call(
-            [
-                '/sbin/initctl',
-                'set-env',
-                '--global',
-                'QT_LOAD_TESTABILITY=1'
-            ]
-        )
-
-    def _reset_environment_variable(self):
-        """Resets the previously added env variable."""
-        subprocess.call(
-            [
-                '/sbin/initctl',
-                'unset-env',
-                'QT_LOAD_TESTABILITY'
-            ]
-        )
+from ubuntuuitoolkit import fixture_setup as toolkit_fixtures
+
+
+class TestabilityEnvironment(toolkit_fixtures.InitctlEnvironmentVariable):
+    """Setup the testabilty environment."""
+
+    def __init__(self):
+        super(TestabilityEnvironment, self).__init__(QT_LOAD_TESTABILITY=1)
 
=== modified file 'ubuntu_experience_tests/tests/test_fixture_setup.py'
--- ubuntu_experience_tests/tests/test_fixture_setup.py	2014-03-10 12:55:24 +0000
+++ ubuntu_experience_tests/tests/test_fixture_setup.py	2014-05-13 14:37:56 +0000
@@ -17,53 +17,31 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>
 
-import subprocess
-
 import testtools
 
+from ubuntuuitoolkit import environment
+
 from ubuntu_experience_tests import fixture_setup
 
 
 class TestabilityEnvironmentTestCase(testtools.TestCase):
 
-    def setUp(self):
-        super(TestabilityEnvironmentTestCase, self).setUp()
-        old_var = self.get_environment_variable()
-        self.addCleanup(self.set_environment_variable, old_var)
-        self.set_environment_variable('dummy')
-
-    def get_environment_variable(self):
+    def get_testability_environment_variable(self):
         try:
-            return subprocess.check_output(
-                [
-                    'initctl',
-                    'get-env',
-                    'QT_LOAD_TESTABILITY'
-                ]
-            ).strip()
+            return environment.get_initctl_env_var('QT_LOAD_TESTABILITY')
         except:
             return None
 
-    def set_environment_variable(self, value):
-        subprocess.call(
-            [
-                '/sbin/initctl',
-                'set-env',
-                'QT_LOAD_TESTABILITY={}'.format(value)
-            ]
-        )
-
     def test_fixture_must_setup_testability_environment(self):
-        """Ensures the environment fixture is setting the environment
-        variable."""
+        """Test the testability environment fixture is setting the variable."""
         fixture = fixture_setup.TestabilityEnvironment()
         self.useFixture(fixture)
 
-        self.assertEquals('1', self.get_environment_variable())
+        self.assertEquals('1', self.get_testability_environment_variable())
 
     def test_fixture_must_cleanup_testability_environment(self):
-        """Ensures the environment fixture is cleanly removing the previously
-        set environment variable."""
+        """Test the testability fixture cleans the variable."""
+        original_value = self.get_testability_environment_variable()
         fixture = fixture_setup.TestabilityEnvironment()
 
         def inner_test():
@@ -74,4 +52,5 @@
 
         inner_test().run()
 
-        self.assertIsNone(self.get_environment_variable())
+        self.assertEqual(
+            original_value, self.get_testability_environment_variable())