u1-test-utils

Merge lp:~elopio/u1-test-utils/sso_client into lp:u1-test-utils

  1. sso_client
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: 55
Merged at revision: 54
Proposed branch: lp:~elopio/u1-test-utils/sso_client
Merge into: lp:u1-test-utils
Diff against target: 31 lines (+5/-4)
2 files modified
setup_vm/unity/run-sso-client (+3/-3)
setup_vm/vms.conf (+2/-1)
To merge this branch: bzr merge lp:~elopio/u1-test-utils/sso_client
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
Review via email: mp+160001@code.launchpad.net

Commit message

Updated the indash payments machine to be able to run ubuntu-sso-client autopilot tests.

Description of the change

With this changes, now you can:
$ bzr branch lp:~elopio/ubuntu-sso-client/autopilot
$ cd autopilot
$ autopilot run ubuntu_sso.tests.acceptance

The tests should be updated to create a new user with the API and it seems some of the things I used for autopilot when writting them are now outdated.
Tomorrow I'll try to merge this tests with vila's branch.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

I trust you on that one, I'm in the middle of conflicting changes so I can't test right now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup_vm/unity/run-sso-client'
2--- setup_vm/unity/run-sso-client 2013-03-28 03:11:06 +0000
3+++ setup_vm/unity/run-sso-client 2013-04-22 04:31:27 +0000
4@@ -4,8 +4,8 @@
5 USSOC_SERVICE_URL={sso.url}/api/1.0/ /usr/lib/ubuntu-sso-client/ubuntu-sso-login &
6 # XXX ugly sleep.
7 sleep 5s
8-# TODO x86_64 sounds like trouble.
9-# This has just stopped working on raring. See http://pad.lv/1161067
10 # TODO in order for the application to be accessible with testability, we need
11 # TESTABILITY=1
12-/usr/lib/ubuntu-sso-client/ubuntu-sso-login-qt --app_name 'Ubuntu One' --help_text '...' --ping_url '{u1.url}/oauth/sso-finished-so-get-tokens/%7Bemail%7D?platform_version=3.8.0-2-generic&platform=Linux&client_version=4.1.90&platform_arch=x86_64' --policy_url {u1.url}/privacy/ --tc_url {u1.url}/terms/
13+export SSO_AUTH_BASE_URL={sso.url}
14+export SSO_UONE_BASE_URL={u1.url}
15+/usr/lib/ubuntu-sso-client/ubuntu-sso-login-qt
16\ No newline at end of file
17
18=== modified file 'setup_vm/vms.conf'
19--- setup_vm/vms.conf 2013-04-12 07:52:06 +0000
20+++ setup_vm/vms.conf 2013-04-22 04:31:27 +0000
21@@ -88,8 +88,9 @@
22 vm.name=indash-didrocks
23 vm.release=raring
24 vm.backing=raring-desktop-pristine.qcow2
25-vm.apt_sources=ppa:didrocks/ppa
26+vm.apt_sources=ppa:didrocks/ppa, ppa:ubuntuone/nightlies
27 vm.uploaded_scripts=unity/run-sso-client, unity/run-unity-lens-music
28+vm.packages=ubuntuone-dev-tools, libautopilot-qt
29 # TODO unity/run-syncdaemon. We don't yet have the hermetic filesync server.
30 vm.update=True
31 vm.root_script=unity/transient-dist-upgrade

Subscribers

People subscribed via source and target branches

to all changes: