ubuntuone-testing

Merge lp:~elopio/ubuntuone-testing/skip-services-payments into lp:ubuntuone-testing

  1. skip-services-payments
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Leo Arias
Approved revision: 101
Merged at revision: 101
Proposed branch: lp:~elopio/ubuntuone-testing/skip-services-payments
Merge into: lp:ubuntuone-testing
Prerequisite: lp:~elopio/ubuntuone-testing/fix-1017525
Diff against target: 71 lines (+6/-10)
4 files modified
ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py (+2/-5)
ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py (+2/-5)
ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py (+1/-0)
ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py (+1/-0)
To merge this branch: bzr merge lp:~elopio/ubuntuone-testing/skip-services-payments
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
Review via email: mp+111867@code.launchpad.net

This proposal supersedes a proposal from 2012-06-25.

Commit message

Skip the services tests that must be updated for Ubuntu Pay.

Description of the change

Skip the services tests that must be updated for Ubuntu Pay.

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The prerequisite https://code.launchpad.net/~elopio/ubuntuone-testing/fix-1017525 has not yet been merged into https://code.launchpad.net/~ubuntuone-hackers/ubuntuone-testing/trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py'
2--- ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py 2012-03-27 19:04:46 +0000
3+++ ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py 2012-06-25 14:49:18 +0000
4@@ -1,10 +1,6 @@
5 # -*- coding: utf-8 -*-
6
7-# Authors:
8-# Rick McBride <rick.mcbride@canonical.com>
9-# Leo Arias <leo.arias@canonical.com>
10-#
11-# Copyright 2011 Canonical Ltd.
12+# Copyright 2011, 2012 Canonical Ltd.
13 #
14 # This program is free software: you can redistribute it and/or modify it
15 # under the terms of the GNU General Public License version 3, as published
16@@ -25,6 +21,7 @@
17 import actions.services as services_actions
18 import actions.payment as payment_actions
19
20+skip('This test must be updated for Ubuntu Pay.')
21 setup_actions.setup()
22 services_actions.open()
23 services_actions.buy_music_streaming_monthly()
24
25=== modified file 'ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py'
26--- ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py 2012-03-27 19:04:46 +0000
27+++ ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py 2012-06-25 14:49:18 +0000
28@@ -1,10 +1,6 @@
29 # -*- coding: utf-8 -*-
30
31-# Authors:
32-# Rick McBride <rick.mcbride@canonical.com>
33-# Leo Arias <leo.arias@canonical.com>
34-#
35-# Copyright 2011 Canonical Ltd.
36+# Copyright 2011, 2012 Canonical Ltd.
37 #
38 # This program is free software: you can redistribute it and/or modify it
39 # under the terms of the GNU General Public License version 3, as published
40@@ -25,6 +21,7 @@
41 import actions.services as services_actions
42 import actions.payment as payment_actions
43
44+skip('This test must be updated for Ubuntu Pay.')
45 setup_actions.setup()
46 services_actions.open()
47 services_actions.buy_music_streaming_yearly()
48
49=== modified file 'ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py'
50--- ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py 2012-06-25 14:49:18 +0000
51+++ ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py 2012-06-25 14:49:18 +0000
52@@ -21,6 +21,7 @@
53 import actions.services as services_actions
54 import actions.payment as payment_actions
55
56+skip('This test must be updated for Ubuntu Pay.')
57 setup_actions.setup()
58 services_actions.open()
59 services_actions.buy_extra_storage_monthly(5)
60
61=== modified file 'ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py'
62--- ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py 2012-06-25 14:49:18 +0000
63+++ ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py 2012-06-25 14:49:18 +0000
64@@ -21,6 +21,7 @@
65 import actions.services as services_actions
66 import actions.payment as payment_actions
67
68+skip('This test must be updated for Ubuntu Pay.')
69 setup_actions.setup()
70 services_actions.open()
71 services_actions.buy_extra_storage_yearly(5)

Subscribers

People subscribed via source and target branches