Merge lp:~elopio/ubuntuone-testing/environments into lp:ubuntuone-testing

[Leo Arias]

Improved the environment handling.

With this changes, we do a better handling of the environment and we will have the chance to run tests on different environments, and filter tests by environment.

[Rick McBride (rmcbride)]

Excellent idea, and well done.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-10-06 19:43:51 +0000
+++ .bzrignore	2011-11-24 05:08:24 +0000
@@ -9,5 +9,6 @@
 passwords.py
 reports/*
 _passwords.py
+_localconfig.py
 sourcecode
 results

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py'
--- ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2011-11-24 05:08:24 +0000
@@ -21,12 +21,15 @@
 """Pay for the music streaming service."""
 
 from sst.actions import *
+from config import ENVIRONMENT
 from datetime import date
 import actions.setup as setup_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
 
+if ENVIRONMENT == 'production':
+    skip('Can\'t test payments on production.')
 setup_actions.setup(new_user=True)
 services_actions.open()
 services_actions.buy_music_streaming_yearly()

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py'
--- ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2011-11-24 05:08:24 +0000
@@ -21,11 +21,14 @@
 """Pay for the additional sotrage service."""
 
 from sst.actions import *
+from config import ENVIRONMENT
 import actions.setup as setup_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
 
+if ENVIRONMENT == 'production':
+    skip('Can\'t test payments on production.')
 setup_actions.setup(new_user=True)
 services_actions.open()
 services_actions.buy_extra_storage()

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py'
--- ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2011-11-24 05:08:24 +0000
@@ -21,11 +21,14 @@
 """Pay for a service with a refused card."""
 
 from sst.actions import *
+from config import ENVIRONMENT
 import actions.setup as setup_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
 
+if ENVIRONMENT == 'production':
+    skip('Can\'t test payments on production.')
 setup_actions.setup()
 services_actions.open()
 services_actions.buy_music_streaming()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2011-11-15 06:38:57 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2011-11-24 05:08:24 +0000
@@ -30,7 +30,6 @@
 import actions.header as header_actions
 import actions.sso as sso_actions
 
-
 def setup(new_user=False):
     """Create new user (optional) and log in to the Ubuntu One website.
 
@@ -41,7 +40,7 @@
     new_user -- Indicates if a new user has to be created for the test.
 
     """
-    set_base_url(base_url)
+    set_base_url(get_base_url())
     set_wait_timeout(DEFAULT_TIMEOUT)
     goto()
     waitfor(title_is, 'Ubuntu One : Home')
@@ -51,3 +50,15 @@
     else:
         sso_actions.login(email, password)
     header_actions.assert_login(full_name)
+
+def get_base_url():
+    base_url = None
+    if ENVIRONMENT == 'staging':
+        base_url = 'https://staging.one.ubuntu.com'
+    elif ENVIRONMENT == 'edge':
+        base_url = 'https://edge.one.ubuntu.com'
+    elif ENVIRONMENT == 'production':
+        base_url = 'https://one.ubuntu.com'
+    else:
+        skip('Unknown environment: %s.' % ENVIRONMENT)
+    return base_url

=== modified file 'ubuntuone/web/tests/sst/shared/actions/sso.py'
--- ubuntuone/web/tests/sst/shared/actions/sso.py	2011-11-15 06:38:57 +0000
+++ ubuntuone/web/tests/sst/shared/actions/sso.py	2011-11-24 05:08:24 +0000
@@ -21,7 +21,7 @@
 """Single Sign On actions for Ubuntu One."""
 
 from sst.actions import *
-from config import base_url
+from setup import get_base_url
 
 def login(email, password):
     """Log in to Ubuntu One website.
@@ -38,7 +38,7 @@
     textfield_write('id_email', email)
     textfield_write('id_password', password)
     button_click(get_element(css_class='btn', name='continue'), wait=False)
-    waitfor(title_is, 'Authenticate to %s' % base_url)
+    waitfor(title_is, 'Authenticate to %s' % get_base_url())
     waitfor(get_element, tag='body')
     button_click(get_element(css_class='btn', name='yes'))
 

=== modified file 'ubuntuone/web/tests/sst/shared/config.py'
--- ubuntuone/web/tests/sst/shared/config.py	2011-11-03 17:56:44 +0000
+++ ubuntuone/web/tests/sst/shared/config.py	2011-11-24 05:08:24 +0000
@@ -19,4 +19,10 @@
 DEFAULT_TIMEOUT = 40
 
 # set below according to need (staging v production v test instance)
-base_url = 'https://staging.one.ubuntu.com/'
+ENVIRONMENT = 'staging'
+#ENVIRONMENT = 'edge'
+#ENVIRONMENT = 'production'
+
+# You can overwrite the default configuration setting the variables on
+# the file shared/_local_config.py.
+from _localconfig import *