Merge lp:~brandontschaefer/unity/python3-start-moving-over-AP-tests into lp:unity

[Brandon Schaefer]

A few simple changes, as we need to start moving our AP tests over to python3.

A few simple changes, as we need to start moving our AP tests over to python3.

The next largest hurdle will be getting compizconfig python3 compliant....

To test install:
  apt-get install python3-autopilot

Then run (in unity/tests/autopilot/)
  python3 -c "import unity.tests"
OR
  autopilot3 list unity.tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3755
http://jenkins.qa.ubuntu.com/job/unity-ci/850/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/386/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/382/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/384

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/850/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Umm, it's not clear to me why you had to change stuff in DecorationsDataPool.[h|cpp] for this MP.

review: Needs Information

[Christopher Townsend (townsend)]

And unityshell.cpp for that matter...

[Brandon Schaefer (brandontschaefer)]

That was me merging a branch from Marco. Opps, i swore i removed that and checked what files I was changed...strange.

[lp:~brandontschaefer/unity/python3-start-moving-over-AP-tests]

3756. By Brandon Schaefer on 2014-04-03

* Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3756
http://jenkins.qa.ubuntu.com/job/unity-ci/851/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/385

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/851/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Well, this breaks running regular Autopilot, so until we fix *everything* to run strictly on python3, then this needs to fixed up to work for both python2.7 and python3.

review: Needs Fixing

Unmerged revisions

3756. By Brandon Schaefer on 2014-04-03

* Merge trunk

3755. By Brandon Schaefer on 2014-04-02

* Start moving to python3 for unity7 AP tests.
* Need to move compizconfig over before we can do much more

=== modified file 'tests/autopilot/unity/emulators/X11.py'
--- tests/autopilot/unity/emulators/X11.py	2014-01-13 18:35:11 +0000
+++ tests/autopilot/unity/emulators/X11.py	2014-04-03 15:54:35 +0000
@@ -90,7 +90,7 @@
     """
     try:
         glxinfo_out = subprocess.check_output("glxinfo")
-    except OSError, e:
+    except OSError:
         raise OSError("Failed to run glxinfo: %s. (do you have mesa-utils installed?)" % e)
 
     for dri in _blacklisted_drivers:

=== modified file 'tests/autopilot/unity/emulators/compiz.py'
--- tests/autopilot/unity/emulators/compiz.py	2013-04-30 22:06:54 +0000
+++ tests/autopilot/unity/emulators/compiz.py	2014-04-03 15:54:35 +0000
@@ -1,9 +1,8 @@
 from __future__ import absolute_import
+from __future__ import absolute_import
 
 """Functions that wrap compizconfig to avoid some unpleasantness in that module."""
 
-from __future__ import absolute_import
-
 from autopilot.utilities import Silence
 
 _global_context = None

=== modified file 'tests/autopilot/unity/emulators/hud.py'
--- tests/autopilot/unity/emulators/hud.py	2013-10-03 01:33:53 +0000
+++ tests/autopilot/unity/emulators/hud.py	2014-04-03 15:54:35 +0000
@@ -14,7 +14,7 @@
 from autopilot.input import Keyboard
 from autopilot.introspection.dbus import StateNotFoundError
 from autopilot.keybindings import KeybindingsHelper
-from HTMLParser import HTMLParser
+from html.parser import HTMLParser
 import re
 
 from unity.emulators import UnityIntrospectionObject

=== modified file 'tests/autopilot/unity/tests/test_gnome_key_grabber.py'
--- tests/autopilot/unity/tests/test_gnome_key_grabber.py	2014-02-06 09:31:09 +0000
+++ tests/autopilot/unity/tests/test_gnome_key_grabber.py	2014-04-03 15:54:35 +0000
@@ -7,7 +7,7 @@
 # by the Free Software Foundation.
 
 import dbus
-import glib
+from gi.repository import GLib
 import unity
 import logging
 

=== modified file 'tests/autopilot/unity/tests/test_ibus.py'
--- tests/autopilot/unity/tests/test_ibus.py	2014-01-29 19:21:24 +0000
+++ tests/autopilot/unity/tests/test_ibus.py	2014-04-03 15:54:35 +0000
@@ -85,7 +85,7 @@
         timeout.start()
         while self._context.get_engine() is None:
             if self._abort is True:
-                print "Error! Could not set the engine correctly."
+                print("Error! Could not set the engine correctly.")
                 return None
             continue
         timeout.cancel()

=== modified file 'tests/autopilot/unity/tests/test_shopping_lens.py'
--- tests/autopilot/unity/tests/test_shopping_lens.py	2013-05-24 15:54:49 +0000
+++ tests/autopilot/unity/tests/test_shopping_lens.py	2014-04-03 15:54:35 +0000
@@ -11,7 +11,7 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, GreaterThan
 from time import sleep
-import urllib2
+from urllib.request import urlopen
 import gettext
 
 from unity.tests import UnityTestCase
@@ -24,7 +24,7 @@
         super(ShoppingScopeTests, self).setUp()
         try:
             urllib2.urlopen("http://www.google.com", timeout=2)
-        except urllib2.URLError, e:
+        except urllib2.URLError:
             self.skip("Skipping test, no internet connection")
         gettext.install("unity-scope-shopping")