Ubuntu File Manager App

Merge lp:~nskaggs/ubuntu-filemanager-app/fix-rename-dir-test into lp:ubuntu-filemanager-app

  1. fix-rename-dir-test
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Michael Spencer
Approved revision: 100
Merged at revision: 97
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/fix-rename-dir-test
Merge into: lp:ubuntu-filemanager-app
Diff against target: 66 lines (+3/-16)
2 files modified
tests/autopilot/ubuntu_filemanager_app/emulators.py (+2/-2)
tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py (+1/-14)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/fix-rename-dir-test
Reviewer Review Type Date Requested Status
Michael Spencer Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+198467@code.launchpad.net

Commit message

Add wait_select_single's to confirmdialog emulator

Description of the change

Fixes http://ci.ubuntu.com/smokeng/trusty/touch/mako/55:20131209.1:20131203/5356/ubuntu-filemanager-app-autopilot/559266/

Issue where it's not finding the dialog with timing and then goes for confirm input dialog instead

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:97
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/101/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/367
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/51

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/101/rebuild

review: Needs Fixing (continuous-integration)
lp:~nskaggs/ubuntu-filemanager-app/fix-rename-dir-test updated
98. By Nicholas Skaggs

is it a timing thing?

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:97
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/102/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/368
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/102
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/102
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/52

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/102/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:98
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/103/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/369
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/53

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/103/rebuild

review: Needs Fixing (continuous-integration)
lp:~nskaggs/ubuntu-filemanager-app/fix-rename-dir-test updated
99. By Nicholas Skaggs

tweaks to select for rename_dir test

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/104/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/371/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/104/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/104/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/54/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/104/rebuild

review: Needs Fixing (continuous-integration)
lp:~nskaggs/ubuntu-filemanager-app/fix-rename-dir-test updated
100. By Nicholas Skaggs

fix pyflakes

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:100
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/105/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/372
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/105
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/105
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/55

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/105/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Spencer (ibelieve) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_filemanager_app/emulators.py'
2--- tests/autopilot/ubuntu_filemanager_app/emulators.py 2013-12-07 19:07:34 +0000
3+++ tests/autopilot/ubuntu_filemanager_app/emulators.py 2013-12-11 01:59:01 +0000
4@@ -82,9 +82,9 @@
5 def get_confirm_dialog(self):
6 """Return a confirm dialog emulator"""
7 try:
8- dialog = self.select_single(ConfirmDialog)
9+ dialog = self.wait_select_single(ConfirmDialog)
10 except dbus.StateNotFoundError:
11- dialog = self.select_single(ConfirmDialogWithInput)
12+ dialog = self.wait_select_single(ConfirmDialogWithInput)
13 return dialog
14
15 def confirm_dialog_exists(self):
16
17=== modified file 'tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py'
18--- tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py 2013-12-03 20:06:46 +0000
19+++ tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py 2013-12-11 01:59:01 +0000
20@@ -28,7 +28,7 @@
21 from autopilot import process
22 from autopilot.platform import model
23 from autopilot.matchers import Eventually
24-from testtools.matchers import Equals, NotEquals, Is, Not
25+from testtools.matchers import Equals, NotEquals
26
27 from ubuntu_filemanager_app.tests import FileManagerTestCase
28
29@@ -156,16 +156,10 @@
30 file_actions_popover.click_button(action)
31
32 def _cancel_confirm_dialog(self):
33- self.assertThat(
34- self.main_view.get_confirm_dialog,
35- Eventually(NotEquals(None)))
36 confirm_dialog = self.main_view.get_confirm_dialog()
37 confirm_dialog.cancel()
38
39 def _confirm_dialog(self, text=None):
40- self.assertThat(
41- self.main_view.get_confirm_dialog,
42- Eventually(NotEquals(None)))
43 confirm_dialog = self.main_view.get_confirm_dialog()
44 if text:
45 confirm_dialog.enter_text(text)
46@@ -231,9 +225,6 @@
47 self._do_action_on_file(first_dir, action='Rename')
48 self._confirm_dialog(new_name)
49
50- #make sure confirm dialog is open
51- self.main_view.get_confirm_dialog()
52-
53 self.assertThat(
54 self.main_view.confirm_dialog_exists, Eventually(Equals(False)))
55 self.assertThat(
56@@ -390,10 +381,6 @@
57 toolbar = self.main_view.open_toolbar()
58 toolbar.click_button('actions')
59
60- self.assertThat(
61- self.main_view.get_folder_actions_popover,
62- Eventually(Not(Is(None))))
63-
64 folder_actions_popover = self.main_view.get_folder_actions_popover()
65 folder_actions_popover.click_button('Create New Folder')
66 self._cancel_confirm_dialog()

Subscribers

People subscribed via source and target branches