Merge lp:~saviq/unity8/wily-skip-bluetooth into lp:unity8

Proposed by Michał Sawicz
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1970
Merged at revision: 1985
Proposed branch: lp:~saviq/unity8/wily-skip-bluetooth
Merge into: lp:unity8
Diff against target: 55 lines (+10/-13)
1 file modified
tests/autopilot/unity8/indicators/tests/test_indicators.py (+10/-13)
To merge this branch: bzr merge lp:~saviq/unity8/wily-skip-bluetooth
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Albert Astals Cid (community) Approve
Review via email: mp+272038@code.launchpad.net

Commit message

Skip bluetooth check under wily, use expectFailure to notice when it's back

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/unity8-ci/6338/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/710
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1050
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/577
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/578
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3521
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4317
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4317/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23594
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/710
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/710/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23595

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
I did not, but this involves tests only and CI reports them passing again so let's trust CI :)

 * Did CI run pass?
Almost!

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

review: Approve
lp:~saviq/unity8/wily-skip-bluetooth updated
1971. By Michał Sawicz

Merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/unity8-ci/6341/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4332/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/949
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/581
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3532/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23619

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/unity8-ci/6342/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4337
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/949
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/582
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4334
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4334/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23623
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/716
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/716/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23624

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/unity8-ci/6344/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/718
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/584
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4338
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4338/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/432
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23636

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1971
http://jenkins.qa.ubuntu.com/job/unity8-ci/6346/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4343
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4340
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23638
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23640

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity8/indicators/tests/test_indicators.py'
2--- tests/autopilot/unity8/indicators/tests/test_indicators.py 2015-03-20 11:31:40 +0000
3+++ tests/autopilot/unity8/indicators/tests/test_indicators.py 2015-09-23 15:06:26 +0000
4@@ -16,9 +16,11 @@
5 # You should have received a copy of the GNU General Public License
6 # along with this program. If not, see <http://www.gnu.org/licenses/>.
7
8+import platform
9+
10 from testscenarios import multiply_scenarios
11
12-from autopilot import platform
13+import autopilot.platform
14
15 from unity8.indicators import tests
16
17@@ -39,12 +41,6 @@
18 tests.IndicatorTestCase.device_emulation_scenarios
19 )
20
21- def setUp(self):
22- super().setUp()
23- if (platform.model() == 'Nexus 10' and
24- self.indicator_name == 'indicator-bluetooth'):
25- self.skipTest('Nexus 10 does not have bluetooth at the moment.')
26-
27 def test_indicator_exists(self):
28 self.main_window._get_indicator_panel_item(
29 self.indicator_name
30@@ -74,12 +70,6 @@
31 tests.IndicatorTestCase.device_emulation_scenarios
32 )
33
34- def setUp(self):
35- super().setUp()
36- if (platform.model() == 'Nexus 10' and
37- self.indicator_name == 'indicator-bluetooth'):
38- self.skipTest('Nexus 10 does not have bluetooth at the moment.')
39-
40 def test_indicator_page_title_matches_widget(self):
41 """Swiping open an indicator must show its correct title.
42
43@@ -87,5 +77,12 @@
44 """
45 indicator_page = self.main_window.open_indicator_page(
46 self.indicator_name)
47+ if self.indicator_name == 'indicator-bluetooth':
48+ if autopilot.platform.model() == 'Nexus 10':
49+ self.expectFailure('Nexus 10 does not have bluetooth at the moment.',
50+ self.assertTrue, indicator_page.visible)
51+ if platform.linux_distribution()[2] == 'wily':
52+ self.expectFailure('Bluetooth doesn\'t work on wily at the moment.',
53+ self.assertTrue, indicator_page.visible)
54 self.assertTrue(indicator_page.visible)
55 self.assertEqual(indicator_page.title, self.title)

Subscribers

People subscribed via source and target branches