Merge lp:~nskaggs/ubuntu-rssreader-app/fix-debian-control into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Nicholas Skaggs]

Small cleanups for dependencies

Small cleanups for dependencies

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

[lp:~nskaggs/ubuntu-rssreader-app/fix-debian-control]

41. By Nicholas Skaggs on 2013-08-15

remove open toolbar line :)

[Joey Chan (qqworini)]

why it wasn't merged yet ?

=== modified file 'debian/control'
--- debian/control	2013-07-10 14:20:14 +0000
+++ debian/control	2013-08-15 15:57:22 +0000
@@ -1,7 +1,7 @@
 Source: ubuntu-rssreader-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9), 
+Build-Depends: debhelper (>= 9),
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-rssreader-app
@@ -24,6 +24,7 @@
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
+         ubuntu-ui-toolkit-autopilot,
          ubuntu-rssreader-app (= ${source:Version})
 Description: Autopilot tests for RSS reader Application
  This package contains the autopilot tests for the RSS reader

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-13 23:10:13 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-15 15:57:22 +0000
@@ -9,14 +9,9 @@
 
 from __future__ import absolute_import
 
-import tempfile
+
 import unittest
 
-import mock
-import os
-import os.path
-import shutil
-
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals, Is, Not
 
@@ -66,6 +61,9 @@
         self.pointing_device.click_object(checkboxBtn)
         self.assertThat(checkboxBtn.checked, Eventually(Equals(True)))
 
+
+        toolbar = self.main_view.open_toolbar()
+
         #click on Next button
         self.assertThat(self.main_view.get_next_button, Eventually(Not(Is(None))))
         nextButton = self.main_view.get_next_button()