Unity 8

Merge lp:~lukas-kde/unity8/fixWizardReportingAutopilot into lp:unity8

fixWizardReportingAutopilot
Merge into trunk

Proposed by Lukáš Tinkl on 2015-10-08

Status:	Merged
Approved by:	Albert Astals Cid on 2015-10-14
Approved revision:	2005
Merged at revision:	2016
Proposed branch:	lp:~lukas-kde/unity8/fixWizardReportingAutopilot
Merge into:	lp:unity8
Diff against target:	52 lines (+17/-7) 2 files modified tests/autopilot/unity8/settings_wizard/__init__.py (+7/-2) tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py (+10/-5)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/fixWizardReportingAutopilot
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-10-14
Albert Astals Cid (community)		2015-10-08	Approve on 2015-10-14
Review via email: mp+273914@code.launchpad.net

Commit message

Fix autopilot wizard test skipping the reporting page

Description of the change

Fix autopilot wizard test skipping the reporting page

Follow up to https://bugs.launchpad.net/bugs/1494442

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-10-09:

Traceback (most recent call last):
File "/usr/lib/python3/dist-packages/unity8/settings_wizard/tests/test_settings_wizard.py", line 91, in test_skipping_through_wizard
if reportingPage is not None:
NameError: name 'reportingPage' is not defined

review: Needs Fixing

lp:~lukas-kde/unity8/fixWizardReportingAutopilot updated on 2015-10-09

2001. By Lukáš Tinkl on 2015-10-09: init the variable

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/fixWizardReportingAutopilot updated on 2015-10-09

2002. By Lukáš Tinkl on 2015-10-09: fixup var names

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-10-13:

reportingPage = None

still typo here

review: Needs Fixing

lp:~lukas-kde/unity8/fixWizardReportingAutopilot updated on 2015-10-13

2003. By Lukáš Tinkl on 2015-10-13: fix typo :/

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-13:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/fixWizardReportingAutopilot updated on 2015-10-13

2004. By Lukáš Tinkl on 2015-10-13: fix finish_page

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-13:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-10-14:

Do we really neeed the "import QtQuick.Window 2.2" in ScreenGrabber? Seems a bit out of place

review: Needs Information

lp:~lukas-kde/unity8/fixWizardReportingAutopilot updated on 2015-10-14

2005. By Lukáš Tinkl on 2015-10-14: fix obsolete import

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-10-14:

> Do we really neeed the "import QtQuick.Window 2.2" in ScreenGrabber? Seems a
> bit out of place

Not needed anymore, removed, thx

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-10-14:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
They pass more than it used to

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-14:

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'tests/autopilot/unity8/settings_wizard/__init__.py'
 --- tests/autopilot/unity8/settings_wizard/__init__.py	2015-05-21 16:52:05 +0000
 +++ tests/autopilot/unity8/settings_wizard/__init__.py	2015-10-14 11:39:54 +0000
@@ -375,12 +375,17 @@
          wizard = get_wizard(self)
          next_page = wizard.get_current_page()
          locationPageEnabled = True
++        reportingPageEnabled = True
          if next_page.objectName == 'locationPage':
              next_page = wizard.get_location_page()
          else:
              locationPageEnabled = False
--            next_page = wizard.get_reporting_page()
--        return locationPageEnabled, next_page
++            if next_page.objectName == 'reportingPage':
++                next_page = wizard.get_reporting_page()
++            else:
++                reportingPageEnabled = False
++                next_page = wizard.get_finished_page()
++        return locationPageEnabled, reportingPageEnabled, next_page
      def _get_notification(self, unity):
          logger.info('Waiting longer for notification object')
 === modified file 'tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py'
 --- tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py	2015-05-21 16:37:36 +0000
 +++ tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py	2015-10-14 11:39:54 +0000
@@ -80,14 +80,19 @@
              password_page = next_page
          wifi_connect_page = self._test_password_page(password_page)
--        locationPageEnabled, next_page = self._test_wifi_connect_page(
--            wifi_connect_page)
++        reporting_page = None
++        locationPageEnabled, reportingPageEnabled, next_page = self._test_wifi_connect_page(wifi_connect_page)
          if locationPageEnabled:
              location_page = next_page
--            reporting_page = self._test_location_page(location_page)
++            if reportingPageEnabled:
++                reporting_page = self._test_location_page(location_page)
++            else:
++                finish_page = next_page
++
++        if reporting_page is not None:
++            finish_page = self._test_reporting_page(reporting_page)
          else:
--            reporting_page = next_page
--        finish_page = self._test_reporting_page(reporting_page)
++            finish_page = next_page
          finish_page.finish()
          self.assertFalse(