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
=== modified file 'ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py'
--- ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py 2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py 2012-06-25 14:49:18 +0000
@@ -1,10 +1,6 @@
1# -*- coding: utf-8 -*-1# -*- coding: utf-8 -*-
22
3# Authors: 3# Copyright 2011, 2012 Canonical Ltd.
4# Rick McBride <rick.mcbride@canonical.com>
5# Leo Arias <leo.arias@canonical.com>
6#
7# Copyright 2011 Canonical Ltd.
8#4#
9# This program is free software: you can redistribute it and/or modify it5# This program is free software: you can redistribute it and/or modify it
10# under the terms of the GNU General Public License version 3, as published6# under the terms of the GNU General Public License version 3, as published
@@ -25,6 +21,7 @@
25import actions.services as services_actions21import actions.services as services_actions
26import actions.payment as payment_actions22import actions.payment as payment_actions
2723
24skip('This test must be updated for Ubuntu Pay.')
28setup_actions.setup()25setup_actions.setup()
29services_actions.open()26services_actions.open()
30services_actions.buy_music_streaming_monthly()27services_actions.buy_music_streaming_monthly()
3128
=== modified file 'ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py'
--- ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py 2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py 2012-06-25 14:49:18 +0000
@@ -1,10 +1,6 @@
1# -*- coding: utf-8 -*-1# -*- coding: utf-8 -*-
22
3# Authors: 3# Copyright 2011, 2012 Canonical Ltd.
4# Rick McBride <rick.mcbride@canonical.com>
5# Leo Arias <leo.arias@canonical.com>
6#
7# Copyright 2011 Canonical Ltd.
8#4#
9# This program is free software: you can redistribute it and/or modify it5# This program is free software: you can redistribute it and/or modify it
10# under the terms of the GNU General Public License version 3, as published6# under the terms of the GNU General Public License version 3, as published
@@ -25,6 +21,7 @@
25import actions.services as services_actions21import actions.services as services_actions
26import actions.payment as payment_actions22import actions.payment as payment_actions
2723
24skip('This test must be updated for Ubuntu Pay.')
28setup_actions.setup()25setup_actions.setup()
29services_actions.open()26services_actions.open()
30services_actions.buy_music_streaming_yearly()27services_actions.buy_music_streaming_yearly()
3128
=== modified file 'ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py 2012-06-25 14:49:18 +0000
+++ ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py 2012-06-25 14:49:18 +0000
@@ -21,6 +21,7 @@
21import actions.services as services_actions21import actions.services as services_actions
22import actions.payment as payment_actions22import actions.payment as payment_actions
2323
24skip('This test must be updated for Ubuntu Pay.')
24setup_actions.setup()25setup_actions.setup()
25services_actions.open()26services_actions.open()
26services_actions.buy_extra_storage_monthly(5)27services_actions.buy_extra_storage_monthly(5)
2728
=== modified file 'ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py 2012-06-25 14:49:18 +0000
+++ ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py 2012-06-25 14:49:18 +0000
@@ -21,6 +21,7 @@
21import actions.services as services_actions21import actions.services as services_actions
22import actions.payment as payment_actions22import actions.payment as payment_actions
2323
24skip('This test must be updated for Ubuntu Pay.')
24setup_actions.setup()25setup_actions.setup()
25services_actions.open()26services_actions.open()
26services_actions.buy_extra_storage_yearly(5)27services_actions.buy_extra_storage_yearly(5)

Subscribers

People subscribed via source and target branches