Merge lp:~popey/ubuntu-docviewer-app/fix-1317198 into lp:ubuntu-docviewer-app/trunk

Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~popey/ubuntu-docviewer-app/fix-1317198
Merge into: lp:ubuntu-docviewer-app/trunk
Diff against target: 68 lines (+4/-12)
2 files modified
tests/autopilot/ubuntu_docviewer_app/tests/__init__.py (+2/-7)
tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py (+2/-5)
To merge this branch: bzr merge lp:~popey/ubuntu-docviewer-app/fix-1317198
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Document Viewer Developers Pending
Review via email: mp+220246@code.launchpad.net

Commit message

pep8 and pyflakes updates - fix bug 1317198

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_docviewer_app/tests/__init__.py'
2--- tests/autopilot/ubuntu_docviewer_app/tests/__init__.py 2013-09-27 19:33:28 +0000
3+++ tests/autopilot/ubuntu_docviewer_app/tests/__init__.py 2014-05-20 12:38:30 +0000
4@@ -7,18 +7,12 @@
5
6 """Docviewer app autopilot tests."""
7
8-import os.path
9-
10-from pprint import pprint
11-
12 from autopilot.input import Mouse, Touch, Pointer
13 from autopilot.platform import model
14 from autopilot.testcase import AutopilotTestCase
15
16-from ubuntuuitoolkit import emulators as toolkit_emulators
17 from ubuntu_docviewer_app import emulators
18
19-
20 class DocviewerTestCase(AutopilotTestCase):
21
22 """A common test case class that provides several useful methods for
23@@ -50,7 +44,8 @@
24 "qmlscene",
25 arg,
26 "/usr/share/ubuntu-docviewer-app/ubuntu-docviewer-app.qml",
27- "--desktop_file_hint=/usr/share/applications/ubuntu-docviewer-app.desktop",
28+ "--desktop_file_hint"
29+ "=/usr/share/applications/ubuntu-docviewer-app.desktop",
30 app_type='qt')
31
32 @property
33
34=== modified file 'tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py'
35--- tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py 2014-05-08 20:14:51 +0000
36+++ tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py 2014-05-20 12:38:30 +0000
37@@ -9,8 +9,6 @@
38
39 from __future__ import absolute_import
40
41-from pprint import pprint
42-
43 from autopilot.matchers import Eventually
44 from testtools.matchers import Equals, NotEquals
45
46@@ -46,7 +44,6 @@
47 self.assertThat(
48 textArea.text, Eventually(NotEquals(False)))
49
50-
51 def test_open_image_file(self):
52
53 filePath = 'ubuntu_docviewer_app/files/ubuntu-touch.jpg'
54@@ -92,7 +89,8 @@
55 self.launch_test_installed(self.sample_dir + filePath)
56
57 self.assertThat(
58- self.app.select_single("Dialog", objectName="unknownDialog").visible,
59+ self.app.select_single("Dialog",
60+ objectName="unknownDialog").visible,
61 Eventually(Equals(True)))
62
63 def test_open_pdf_file_type(self):
64@@ -116,4 +114,3 @@
65 self.launch_test_installed(self.sample_dir + filePath)
66
67 self.check_mimeType()
68-

Subscribers

People subscribed via source and target branches