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

[Leo Arias]

Update autopilot tests for some changes in apps and unity8.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

=== 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 @@
         auth_data = account_service.get_auth_data()
         identity = auth_data.get_credentials_id()
         method = auth_data.get_method()
-        mechanism = auth_data.get_method()
+        mechanism = auth_data.get_mechanism()
         session_data = auth_data.get_parameters()
         session = Signon.AuthSession.new(identity, method)
         session.process(

=== 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 @@
         logging.info('Restarting click scope.')
         os.system('pkill -f -9 clickscope.ini')
         lib_path = '/usr/lib/$DEB_HOST_MULTIARCH/'
-        scoperunner_path = os.path.join(lib_path, 'scoperunner/scoperunner')
+        scoperunner_path = os.path.join(lib_path, 'unity-scopes/scoperunner')
         clickscope_config_ini_path = os.path.join(
             lib_path, 'unity-scopes/clickscope/clickscope.ini')
         os.system(
@@ -161,11 +161,11 @@
     def test_search_available_app(self):
         self.search('Shorts')
         applications = self.scope.get_applications('appstore')
-        self.assertThat(applications[0].title, Equals('Shorts'))
+        self.assertThat(applications[0], Equals('Shorts'))
 
     def test_open_app_preview(self):
         expected_details = dict(
-            title='Shorts', subtitle='Shorts is an rssreader application')
+            title='Shorts', subtitle='Ubuntu Click Loader')
         preview = self.open_app_preview('appstore', 'Shorts')
         details = preview.get_details()
         self.assertEqual(details, expected_details)
@@ -182,14 +182,13 @@
 class ClickScopeTestCaseWithCredentials(BaseClickScopeTestCase):
 
     def setUp(self):
-        self.skipTest('segfaults. TODO in following branches.')
+#        self.skipTest('segfaults. TODO in following branches.')
         self.add_u1_credentials()
         super(ClickScopeTestCaseWithCredentials, self).setUp()
         self.scope = self.open_scope()
         self.preview = self.open_app_preview('appstore', 'Shorts')
 
     def add_u1_credentials(self):
-        import pdb; pdb.set_trace()
         account_manager = credentials.AccountManager()
         account = account_manager.add_u1_credentials(
             '[e-mail]', 'dummy')