Merge lp:~elopio/ubuntu-system-settings/my_less_flaky into lp:~ken-vandine/ubuntu-system-settings/less_flaky

[Leo Arias]

Fixed issues to make ken's branch pass.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1229
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~elopio/ubuntu-system-settings/my_less_flaky/+merge/245879/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1886/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/737
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/737/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16944

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1886/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-12-12 19:48:55 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-01-08 19:51:51 +0000
@@ -417,7 +417,7 @@
     @classmethod
     def validate_dbus_object(cls, path, state):
         name = introspection.get_classname_from_path(path)
-        if name == b'ItemPage':
+        if name == b'PageComponent':
             if state['objectName'][1] == 'aboutPage':
                 return True
         return False
@@ -460,6 +460,7 @@
     def go_to_check_for_updates(self):
         check_for_updates_button = self.select_single(
             objectName='updateButton')
+        check_for_updates_button.swipe_into_view()
         self.pointing_device.click_object(check_for_updates_button)
         system_updates_page = self.get_root_instance().wait_select_single(
             objectName='systemUpdatesPage')

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-12-12 19:48:55 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-01-08 19:51:51 +0000
@@ -338,9 +338,9 @@
 
 
 class AboutBaseTestCase(UbuntuSystemSettingsTestCase):
-    def setUp(self, panel=None):
+    def setUp(self):
         """Go to About page."""
-        super(AboutBaseTestCase, self).setUp(panel)
+        super(AboutBaseTestCase, self).setUp()
         self.about_page = self.main_view.go_to_about_page()
 
 
@@ -423,7 +423,7 @@
 
     def setUp(self):
         """Go to License Page."""
-        super(LicenseBaseTestCase, self).setUp('about')
+        super(LicenseBaseTestCase, self).setUp()
         self.licenses_page = self.about_page.go_to_software_licenses()
 
 
@@ -523,11 +523,14 @@
     @classmethod
     def setUpClass(klass):
         klass.start_system_bus()
-        klass.start_session_bus()
         klass.dbus_con = klass.get_dbus(True)
         klass.dbus_con_session = klass.get_dbus(False)
 
     def setUp(self, panel='sound'):
+        # TODO only do this if the sound indicator is running.
+        # --elopio - 2015-01-08
+        self.stop_sound_indicator()
+        self.addCleanup(self.start_sound_indicator)
 
         user_obj = '/user/foo'
 
@@ -671,6 +674,12 @@
         self.mock_isound.wait()
         super(SoundBaseTestCase, self).tearDown()
 
+    def start_sound_indicator(self):
+        subprocess.call(['initctl', 'start', 'indicator-sound'])
+
+    def stop_sound_indicator(self):
+        subprocess.call(['initctl', 'stop', 'indicator-sound'])
+
 
 class ResetBaseTestCase(UbuntuSystemSettingsTestCase,
                         dbusmock.DBusTestCase):