Merge lp:~veebers/autopilot/update_functional_tests_for_py3 into lp:autopilot

[Christopher Lee]

Update the autopilot funcational tests so they work under python 3.

Update the autopilot funcational tests so they work under python 3 (now that we can use tox to run under py33).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/autopilot-ci/260/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/260/rebuild

review: Approve (continuous-integration)

[lp:~veebers/autopilot/update_functional_tests_for_py3]

349. By Christopher Lee on 2013-10-04

Better/more specific checking of error output.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/autopilot-ci/261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/261/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'autopilot/tests/functional/__init__.py'
--- autopilot/tests/functional/__init__.py	2013-09-17 18:50:07 +0000
+++ autopilot/tests/functional/__init__.py	2013-10-04 01:19:57 +0000
@@ -116,6 +116,7 @@
             env=environ,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            universal_newlines=True,
         )
 
         stdout, stderr = process.communicate()
@@ -124,17 +125,11 @@
         self.addDetail('retcode', text_content(str(retcode)))
         self.addDetail(
             'stdout',
-            Content(
-                ContentType('text', 'plain', {'charset': 'iso-8859-1'}),
-                lambda: [stdout]
-            )
+            text_content(stdout)
         )
         self.addDetail(
             'stderr',
-            Content(
-                ContentType('text', 'plain', {'charset': 'iso-8859-1'}),
-                lambda: [stderr]
-            )
+            text_content(stderr)
         )
 
         return (retcode, stdout, stderr)
 
=== modified file 'autopilot/tests/functional/test_autopilot_functional.py'
--- autopilot/tests/functional/test_autopilot_functional.py	2013-09-25 02:23:02 +0000
+++ autopilot/tests/functional/test_autopilot_functional.py	2013-10-04 01:19:57 +0000
@@ -23,6 +23,7 @@
 from codecs import open
 import os
 import os.path
+import re
 from tempfile import mktemp
 from testtools.matchers import Contains, Equals, MatchesRegex, Not
 from textwrap import dedent
@@ -119,10 +120,15 @@
             """)
         )
         code, output, error = self.run_autopilot_list()
-        expected_output = '''ImportError: No module named asdjkhdfjgsdhfjhsd'''
         self.assertThat(code, Equals(0))
         self.assertThat(error, Equals(''))
-        self.assertThat(output, Contains(expected_output))
+        self.assertThat(
+            output,
+            MatchesRegex(
+                ".*ImportError: No module named [']?asdjkhdfjgsdhfjhsd[']?.*",
+                re.DOTALL
+            )
+        )
 
     def test_list_tests_with_syntax_error(self):
         self.create_test_file(
@@ -500,11 +506,15 @@
 
         code, output, error = self.run_autopilot(["run", "tests"])
 
-        expected_error = 'ImportError: No module named asdjkhdfjgsdhfjhsd'
-
         self.assertThat(code, Equals(1))
         self.assertThat(error, Equals(''))
-        self.assertThat(output, Contains(expected_error))
+        self.assertThat(
+            output,
+            MatchesRegex(
+                ".*ImportError: No module named [']?asdjkhdfjgsdhfjhsd[']?.*",
+                re.DOTALL
+            )
+        )
         self.assertThat(output, Contains("FAILED (failures=1)"))
 
     def test_runs_with_syntax_errors_fail(self):
@@ -825,7 +835,7 @@
             class SimpleTest(AutopilotTestCase):
 
                 def test_simple(self):
-                    self.assertTrue()
+                    raise RuntimeError("Intentionally fail test.")
             """)
         )
 
@@ -837,8 +847,9 @@
             error, Contains("ERROR: tests.test_simple.SimpleTest.test_simple"))
         self.assertThat(error, Contains("traceback:"))
         self.assertThat(
-            error, Contains("TypeError: assertTrue() takes at least 2 "
-                            "arguments (1 given)"))
+            error,
+            Contains("RuntimeError: Intentionally fail test.")
+        )
 
     def test_verbose_flag_shows_failure(self):
         """Verbose log must indicate a test failure with a traceback (xml
 
=== modified file 'autopilot/tests/functional/test_dbus_query.py'
--- autopilot/tests/functional/test_dbus_query.py	2013-09-26 21:29:46 +0000
+++ autopilot/tests/functional/test_dbus_query.py	2013-10-04 01:19:57 +0000
@@ -157,7 +157,7 @@
         match_fn = lambda: app.select_single(title="Non-existant object")
         self.assertThat(
             match_fn,
-            raises(StateNotFoundError(title="Non-existant object"))
+            raises(StateNotFoundError('*', title="Non-existant object"))
         )
 
     def test_select_single_returning_multiple_raises(self):