unity-scope-click

Merge lp:~elopio/unity-scope-click/update_new_scopes2 into lp:unity-scope-click/devel

  1. update_new_scopes2
  2. Merge into devel
Proposed by Leo Arias
Status: Merged
Approved by: dobey
Approved revision: 226
Merged at revision: 254
Proposed branch: lp:~elopio/unity-scope-click/update_new_scopes2
Merge into: lp:unity-scope-click/devel
Diff against target: 55 lines (+5/-6)
2 files modified
autopilot/unityclickscope/credentials.py (+1/-1)
autopilot/unityclickscope/test_click_scope.py (+4/-5)
To merge this branch: bzr merge lp:~elopio/unity-scope-click/update_new_scopes2
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
dobey (community) Approve
Review via email: mp+219528@code.launchpad.net

This proposal supersedes a proposal from 2014-05-14.

Commit message

Update autopilot tests for some changes in apps and unity8.

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

FAILED: Continuous integration, rev:226
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~elopio/unity-scope-click/update_new_scopes2/+merge/219528/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/56/rebuild

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

PASSED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/31

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/57/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'autopilot/unityclickscope/credentials.py'
--- autopilot/unityclickscope/credentials.py 2014-01-28 05:21:19 +0000
+++ autopilot/unityclickscope/credentials.py 2014-05-14 13:36:30 +0000
@@ -90,7 +90,7 @@
90 auth_data = account_service.get_auth_data()90 auth_data = account_service.get_auth_data()
91 identity = auth_data.get_credentials_id()91 identity = auth_data.get_credentials_id()
92 method = auth_data.get_method()92 method = auth_data.get_method()
93 mechanism = auth_data.get_method()93 mechanism = auth_data.get_mechanism()
94 session_data = auth_data.get_parameters()94 session_data = auth_data.get_parameters()
95 session = Signon.AuthSession.new(identity, method)95 session = Signon.AuthSession.new(identity, method)
96 session.process(96 session.process(
9797
=== modified file 'autopilot/unityclickscope/test_click_scope.py'
--- autopilot/unityclickscope/test_click_scope.py 2014-04-09 16:36:08 +0000
+++ autopilot/unityclickscope/test_click_scope.py 2014-05-14 13:36:30 +0000
@@ -107,7 +107,7 @@
107 logging.info('Restarting click scope.')107 logging.info('Restarting click scope.')
108 os.system('pkill -f -9 clickscope.ini')108 os.system('pkill -f -9 clickscope.ini')
109 lib_path = '/usr/lib/$DEB_HOST_MULTIARCH/'109 lib_path = '/usr/lib/$DEB_HOST_MULTIARCH/'
110 scoperunner_path = os.path.join(lib_path, 'scoperunner/scoperunner')110 scoperunner_path = os.path.join(lib_path, 'unity-scopes/scoperunner')
111 clickscope_config_ini_path = os.path.join(111 clickscope_config_ini_path = os.path.join(
112 lib_path, 'unity-scopes/clickscope/clickscope.ini')112 lib_path, 'unity-scopes/clickscope/clickscope.ini')
113 os.system(113 os.system(
@@ -161,11 +161,11 @@
161 def test_search_available_app(self):161 def test_search_available_app(self):
162 self.search('Shorts')162 self.search('Shorts')
163 applications = self.scope.get_applications('appstore')163 applications = self.scope.get_applications('appstore')
164 self.assertThat(applications[0].title, Equals('Shorts'))164 self.assertThat(applications[0], Equals('Shorts'))
165165
166 def test_open_app_preview(self):166 def test_open_app_preview(self):
167 expected_details = dict(167 expected_details = dict(
168 title='Shorts', subtitle='Shorts is an rssreader application')168 title='Shorts', subtitle='Ubuntu Click Loader')
169 preview = self.open_app_preview('appstore', 'Shorts')169 preview = self.open_app_preview('appstore', 'Shorts')
170 details = preview.get_details()170 details = preview.get_details()
171 self.assertEqual(details, expected_details)171 self.assertEqual(details, expected_details)
@@ -182,14 +182,13 @@
182class ClickScopeTestCaseWithCredentials(BaseClickScopeTestCase):182class ClickScopeTestCaseWithCredentials(BaseClickScopeTestCase):
183183
184 def setUp(self):184 def setUp(self):
185 self.skipTest('segfaults. TODO in following branches.')185# self.skipTest('segfaults. TODO in following branches.')
186 self.add_u1_credentials()186 self.add_u1_credentials()
187 super(ClickScopeTestCaseWithCredentials, self).setUp()187 super(ClickScopeTestCaseWithCredentials, self).setUp()
188 self.scope = self.open_scope()188 self.scope = self.open_scope()
189 self.preview = self.open_app_preview('appstore', 'Shorts')189 self.preview = self.open_app_preview('appstore', 'Shorts')
190190
191 def add_u1_credentials(self):191 def add_u1_credentials(self):
192 import pdb; pdb.set_trace()
193 account_manager = credentials.AccountManager()192 account_manager = credentials.AccountManager()
194 account = account_manager.add_u1_credentials(193 account = account_manager.add_u1_credentials(
195 'dummy@example.com', 'dummy')194 'dummy@example.com', 'dummy')

Subscribers

People subscribed via source and target branches

to all changes: