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

[Leo Arias]

Added configglue configuration.

Added configglue configuration.
Updated and added tests to try the config files.

Test this branch with:

sst-run -d /path/to/ubuntuone-testing/ubuntuone/web/tests/sst/ u1webs10_login
sst-run -d /path/to/ubuntuone-testing/ubuntuone/web/tests/sst/ u1weba8_createaccount

[Vincent Ladeuil (vila)]

review: Approve

[Corey Goldberg (coreygoldberg)]

looks good. ran tests with local config.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-06-19 20:26:48 +0000
+++ .bzrignore	2012-08-10 00:06:19 +0000
@@ -6,12 +6,7 @@
 *.pyc
 ubuntuone_testing_log
 testdata/*.file
-passwords.py
 reports/*
-_passwords.py
-_musicpasswords.py
-_localconfig.py
 sourcecode
 results
-_devserver.py
-_photopasswords.py
+local.cfg
\ No newline at end of file

=== modified file 'ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py'
--- ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2012-06-26 16:39:03 +0000
+++ ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2012-08-10 00:06:19 +0000
@@ -23,15 +23,11 @@
 import actions.setup as setup_actions
 import actions.account as account_actions
 from _passwords import full_name, email
-from config import ENVIRONMENT
+from config import environment
 
 setup_actions.setup()
 account_actions.open()
 account_actions.assert_account_details(full_name, email)
 account_actions.click_edit_account_details()
-url = None
-if ENVIRONMENT == 'staging':
-    url = 'https://login.staging.ubuntu.com/'
-else:
-    url = 'https://login.ubuntu.com/'
-assert_url(url)
+sso_url = environment.get_environment().sso_url
+assert_url(sso_url)

=== added file 'ubuntuone/web/tests/sst/account/u1weba8_createaccount.py'
--- ubuntuone/web/tests/sst/account/u1weba8_createaccount.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/account/u1weba8_createaccount.py	2012-08-10 00:06:19 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from sst.actions import *
+import actions.setup as setup_actions
+import actions.dashboard as dashboard_actions
+import actions.header as header_actions
+
+setup_actions.setup(new_user=True)
+user = setup_actions.get_user()
+dashboard_actions.assert_page_title()
+header_actions.assert_login(user.full_name)
+dashboard_actions.assert_welcome_message(user.full_name)

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py'
--- ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2012-06-25 13:59:33 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2012-08-10 00:06:19 +0000
@@ -21,7 +21,7 @@
 """Pay for the music streaming service."""
 
 from sst.actions import *
-from config import ENVIRONMENT
+from config import environment
 from datetime import date
 import actions.setup as setup_actions
 import actions.services as services_actions
@@ -29,8 +29,8 @@
 import actions.payment_confirmed as payment_confirmed_actions
 
 skip('This test must be updated for Ubuntu Pay.')
-if ENVIRONMENT == 'production':
-    skip('Can\'t test payments on production.')
+if not environment.can_make_payments():
+    skip('Can\'t test payments on this environment.')
 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	2012-06-25 13:59:33 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2012-08-10 00:06:19 +0000
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 # Authors: 
 #     Rick McBride <[e-mail]>
 #     Leo Arias <[e-mail]>
@@ -21,7 +20,7 @@
 """Pay for the additional sotrage service."""
 
 from sst.actions import *
-from config import ENVIRONMENT
+from config import environment
 import actions.setup as setup_actions
 import actions.services as services_actions
 import actions.payment as payment_actions

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py'
--- ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2012-06-25 13:59:33 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2012-08-10 00:06:19 +0000
@@ -21,15 +21,15 @@
 """Pay for a service with a refused card."""
 
 from sst.actions import *
-from config import ENVIRONMENT
+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
 
 skip('This test must be updated for Ubuntu Pay.')
-if ENVIRONMENT == 'production':
-    skip('Can\'t test payments on production.')
+if not environment.can_make_payments():
+    skip('Can\'t test payments on this environment.')
 setup_actions.setup()
 services_actions.open()
 services_actions.buy_music_streaming()

=== renamed file 'ubuntuone/web/tests/sst/session/u1webs002_login.py' => 'ubuntuone/web/tests/sst/session/u1webs10_login.py'
--- ubuntuone/web/tests/sst/session/u1webs002_login.py	2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/session/u1webs10_login.py	2012-08-10 00:06:19 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011, 2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -14,18 +14,13 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Test case u1webs-002 Log in.
-Log in to the website with an existing account.
-
-"""
-
 from sst.actions import *
 import actions.setup as setup_actions
 import actions.dashboard as dashboard_actions
 import actions.header as header_actions
-from _passwords import full_name
 
 setup_actions.setup(new_user=False)
+user = setup_actions.get_user()
 dashboard_actions.assert_page_title()
-header_actions.assert_login(full_name)
-dashboard_actions.assert_welcome_message(full_name)
+header_actions.assert_login(user.full_name)
+dashboard_actions.assert_welcome_message(user.full_name)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/dashboard.py'
--- ubuntuone/web/tests/sst/shared/actions/dashboard.py	2012-02-02 01:23:26 +0000
+++ ubuntuone/web/tests/sst/shared/actions/dashboard.py	2012-08-10 00:06:19 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011, 2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -24,17 +24,23 @@
     click_link(_get_dashboard_link())
     assert_page_title(), 'Dashboard should be opened'
 
+
 def _get_dashboard_link():
     return get_element_by_css('#main-nav .dashboard')
 
+
 def assert_page_title():
     assert_title(PAGE_TITLE)
 
+
 def wait_for_page_to_load():
     wait_for(assert_title, PAGE_TITLE)
 
+
 def assert_welcome_message(user_full_name):
-    assert_text(_get_welcome_element(), 'Hi %s! Welcome Back' % user_full_name)
+    assert_text(_get_welcome_element(), 
+        'Hi %s! Welcome Back' % user_full_name[:40])
+
     
 def _get_welcome_element():
     return get_element_by_css('h1')

=== modified file 'ubuntuone/web/tests/sst/shared/actions/files.py'
--- ubuntuone/web/tests/sst/shared/actions/files.py	2012-07-15 02:04:04 +0000
+++ ubuntuone/web/tests/sst/shared/actions/files.py	2012-08-10 00:06:19 +0000
@@ -19,7 +19,7 @@
 from sst.actions import *
 from sst.actions import _get_elem
 from loading import *
-from config import *
+from config import environment
 import urlparse
 
 
@@ -229,13 +229,7 @@
     identifier -- The identifier of the file.
 
     """
-    files_url = None
-    if ENVIRONMENT == 'staging':
-        files_url = 'https://files.staging.one.ubuntu.com/'
-    elif ENVIRONMENT == 'edge':
-        files_url = 'https://files.edge.one.ubuntu.com/'
-    elif ENVIRONMENT == 'production':
-        files_url = 'https://files.one.ubuntu.com/'
+    files_url = environment.get_environment().files_url
     file_url = files_url + str(identifier[3:])
     return get_element(css_class='download-button', href=file_url)
 

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2012-07-15 05:27:44 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2012-08-10 00:06:19 +0000
@@ -17,27 +17,27 @@
 """Set up actions for Ubuntu One sst tests."""
 
 from sst.actions import *
-from config import *
+from config import schema
+from config import environment
 from data.user import User
+from data.environment import Environment
 import actions.header as header_actions
 import actions.sso as sso_actions
 import actions.services as services_actions
 import actions.dashboard as dashboard_actions
 import uuid
 from utils import mail
-try:
-    from _passwords import full_name, email, password
-except:
-    skip('Try adding a _passwords.py file to the shared folder if you ' \
-        'expect this to work. Read the README.txt file ;)')
 
+# The user account for the test.
+user = None
 
 def setup(login_or_sign_up=True, new_user=False, user=None):
-    set_wait_timeout(DEFAULT_TIMEOUT)
+    config_values = schema.glue.schema_parser.values('__main__')
+    set_wait_timeout(config_values.get('default_timeout'))
     _go_to_ubuntu_one_home()
     _clear_previous_session()
     if login_or_sign_up:
-        _get_user_and_login_or_sign_up(new_user, user)
+        _make_user_and_login_or_sign_up(new_user, user)
 
 
 def _go_to_ubuntu_one_home():
@@ -47,21 +47,7 @@
 
 
 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'
-    elif ENVIRONMENT == 'development':
-        if address:
-            base_url = address
-        else:
-            skip('development target specified, but address not set.')
-    else:
-        skip('Unknown environment: %s.' % ENVIRONMENT)
-    return base_url
+    return environment.get_environment().url
 
 
 def _clear_previous_session():
@@ -76,23 +62,52 @@
         _go_to_ubuntu_one_home()
 
 
-def _get_user_and_login_or_sign_up(new_user, user):
+def _make_user_and_login_or_sign_up(new_user, user):
     if user is None:
-        user = _get_user(new_user)
+        user = _make_user(new_user)
+    _set_user(user)
     _login_or_sign_up(new_user, user)
     dashboard_actions.wait_for_page_to_load()
     header_actions.assert_login(user.full_name)
 
 
-def _get_user(new_user):
+def _make_user(new_user):
     test_user = None
     if new_user:
-        test_user = _get_random_user()
+        test_user = _make_random_user()
     else:
-        test_user = _get_user_from_configuration()
+        test_user = _make_user_from_configuration()
     return test_user
 
 
+def _make_random_user():
+    random_user_uuid = str(uuid.uuid1())
+    config_values = schema.glue.schema_parser.values('NewUser')
+    full_name_pattern = config_values.get('full_name_pattern')
+    email_address_pattern = config_values.get('email_address_pattern')
+    random_full_name = full_name_pattern % random_user_uuid
+    random_email_address = email_address_pattern % random_user_uuid
+    password = config_values.get('password')
+    return User(random_full_name, random_email_address, password)
+
+
+def _make_user_from_configuration():
+    config_values = schema.glue.schema_parser.values('DefaultUser')
+    full_name = config_values.get('full_name')
+    email_address = config_values.get('email_address')
+    password = config_values.get('password')
+    return User(full_name, email_address, password)
+
+
+def _set_user(user_data):
+    global user
+    user = user_data
+
+
+def get_user():
+    return user
+
+
 def _login_or_sign_up(new_user, user):
     if new_user:
         _sign_up(user)
@@ -100,26 +115,15 @@
         _login(user)
 
 
-def _get_user_from_configuration():
-    return User(full_name, email, password)
-
-
-def _get_random_user():
-    random_user_uuid = str(uuid.uuid1())
-    random_user_name = 'Test user ' + random_user_uuid
-    random_user_email = random_user_uuid + '@' + IMAP_SERVER
-    random_user_password = 'Hola123*'
-    return User(random_user_name, random_user_email, random_user_password)
-
 
 def _sign_up(user):
-    if ENVIRONMENT == 'production':
-        skip('Can\'t create new users on production.')
-    else:
+    if environment.can_create_new_users():
         header_actions.click_login_or_sign_up()
         sso_actions.create_new_account(user)
         _confirm_email(user.email)
-        services_actions.agree_and_subscribe_to_free_plan()
+        services_actions.agree_and_subscribe_to_free_plan()        
+    else:
+        skip('Can\'t create new users on this environment.')
 
 
 def _confirm_email(email):
@@ -130,7 +134,7 @@
 
 def _login(user):
     header_actions.click_login_or_sign_up()
-    if ENVIRONMENT == 'development':
+    if environment.is_development_environment():
         wait_for(assert_title, 'Ubuntu One :')
         switch_to_window()
         click_button(get_elements('button.cta[type="submit"]')[0], wait=False)

=== added directory 'ubuntuone/web/tests/sst/shared/config'
=== removed file 'ubuntuone/web/tests/sst/shared/config.py'
--- ubuntuone/web/tests/sst/shared/config.py	2012-06-04 21:23:42 +0000
+++ ubuntuone/web/tests/sst/shared/config.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Waiting actions will wait for this amount of seconds, unless a different
-# timeout is set calling the SST action set_wait_timeout.
-DEFAULT_TIMEOUT = 40
-
-# set below according to need (staging v production v edge v development
-# test instance)
-ENVIRONMENT = 'staging'
-#ENVIRONMENT = 'edge'
-#ENVIRONMENT = 'production'
-#ENVIRONMENT = 'development'
-
-# Email inbox data
-IMAP_SERVER = 'mail.canonical.com'
-IMAP_USERNAME = 'u1test'
-IMAP_PASSWORD = 'password'
-
-# You can overwrite the default configuration setting the variables on
-# the file shared/_local_config.py.
-try:
-    from _localconfig import *
-except ImportError:
-    pass

=== added file 'ubuntuone/web/tests/sst/shared/config/__init__.py'
=== added file 'ubuntuone/web/tests/sst/shared/config/environment.py'
--- ubuntuone/web/tests/sst/shared/config/environment.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/config/environment.py	2012-08-10 00:06:19 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from config import schema
+from data.environment import Environment
+
+environment_data = None
+
+def get_environment():
+    global environment_data
+    if not environment_data:
+        config_values = schema.glue.schema_parser.values('Server')
+        name = config_values.get('environment')
+        url = config_values.get('url')
+        sso_url = config_values.get('sso_url')
+        files_url = config_values.get('files_url')
+        environment_data = Environment(name, url, sso_url, files_url)
+    return environment_data
+
+
+def is_staging_environment():
+    return get_environment().name == 'staging'
+
+
+def is_development_environment():
+    return get_environment().name == 'production'
+
+
+def can_create_new_users():
+    return is_staging_environment()
+
+
+def can_make_payments():
+    return is_staging_environment()
+
+

=== added file 'ubuntuone/web/tests/sst/shared/config/sample.cfg'
--- ubuntuone/web/tests/sst/shared/config/sample.cfg	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/config/sample.cfg	2012-08-10 00:06:19 +0000
@@ -0,0 +1,25 @@
+[__main__]
+default_timeout: 40
+
+[Server]
+environment: staging
+
+[DefaultUser]
+full_name: Test user
+email_address: [e-mail]
+password: Hola123*
+
+[NewUser]
+full_name_pattern: Test user %s 
+email_address_pattern: [e-mail]
+password: Hola123*
+imap_server: mail.example.com
+imap_port: 993
+imap_use_ssl: True
+imap_username: test
+imap_password: Hola123*
+
+[MusicUser]
+full_name: Test user
+email_address: [e-mail]
+password: Hola123*
\ No newline at end of file

=== added file 'ubuntuone/web/tests/sst/shared/config/schema.py'
--- ubuntuone/web/tests/sst/shared/config/schema.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/config/schema.py	2012-08-10 00:06:19 +0000
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from configglue import schema
+from configglue.glue import configglue
+import sys
+import os.path
+
+class SstSchema(schema.Schema):
+
+    default_timeout = schema.IntOption(default=40)
+
+    class Server(schema.Section):
+        environment = schema.StringOption(default='staging')
+        url = schema.StringOption(default=None)
+        sso_url = schema.StringOption(default=None)
+        files_url = schema.StringOption(default=None)
+
+
+    class DefaultUser(schema.Section):
+        full_name = schema.StringOption()
+        email_address = schema.StringOption()
+        password = schema.StringOption()
+
+
+    class NewUser(schema.Section):
+        full_name_pattern = schema.StringOption(default='Test user %s',
+            raw=True)
+        email_address_pattern = schema.StringOption(raw=True)
+        password = schema.StringOption(default='Hola123*')
+        imap_server = schema.StringOption()
+        imap_port = schema.IntOption(default=993)
+        imap_use_ssl = schema.BoolOption(default=True)
+        imap_username = schema.StringOption()
+        imap_password = schema.StringOption()
+
+
+    class MusicUser(schema.Section):
+        full_name = schema.StringOption()
+        email_address = schema.StringOption()
+        password = schema.StringOption()
+
+# XXX The command line arguments are for SST, not for u1 tests.
+# We will do something to SST on the future so it uses configglue, 
+# or makes available all the additional arguments.
+sys.argv = []
+current_dir = os.path.dirname(os.path.abspath(__file__))
+glue = configglue(SstSchema, os.path.join(current_dir, 'local.cfg'))

=== added file 'ubuntuone/web/tests/sst/shared/data/environment.py'
--- ubuntuone/web/tests/sst/shared/data/environment.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/data/environment.py	2012-08-10 00:06:19 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+base_urls = {'staging': 'https://staging.one.ubuntu.com',
+             'edge': 'https://edge.one.ubuntu.com',
+             'production': 'https://one.ubuntu.com'}
+sso_urls = {'staging': 'https://loging.staging.ubuntu.com',
+            'edge': 'https://loging.ubuntu.com',
+            'production': 'https://loging.ubuntu.com'}
+files_urls = {'staging': 'https://staging.one.ubuntu.com',
+              'edge': 'https://edge.one.ubuntu.com',
+              'production': 'https://one.ubuntu.com'}
+
+class Environment:
+
+    def __init__(self, name, url, sso_url, files_url):
+        self.name = name
+        if url:
+            self.url = url
+        else:
+            self.url = base_urls[name]
+        if sso_url:
+            self.sso_url = sso_url
+        else:
+            self.sso_url = sso_urls[name]
+        if files_url:
+            self.files_url = files_url
+        else:
+            self.files_url = files_urls[name]
+      
+    

=== removed file 'ubuntuone/web/tests/sst/shared/edge_config.py'
--- ubuntuone/web/tests/sst/shared/edge_config.py	2011-09-29 17:53:44 +0000
+++ ubuntuone/web/tests/sst/shared/edge_config.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# set below according to need (staging v production v test instance)
-base_url = 'https://edge.one.ubuntu.com/'

=== removed file 'ubuntuone/web/tests/sst/shared/prod_config.py'
--- ubuntuone/web/tests/sst/shared/prod_config.py	2011-09-29 17:53:44 +0000
+++ ubuntuone/web/tests/sst/shared/prod_config.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# set below according to need (staging v production v test instance)
-base_url = 'https://one.ubuntu.com/'

=== removed file 'ubuntuone/web/tests/sst/shared/stag_config.py'
--- ubuntuone/web/tests/sst/shared/stag_config.py	2011-09-29 17:53:44 +0000
+++ ubuntuone/web/tests/sst/shared/stag_config.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# set below according to need (staging v production v test instance)
-base_url = 'https://staging.one.ubuntu.com/'

=== modified file 'ubuntuone/web/tests/sst/shared/utils/mail.py'
--- ubuntuone/web/tests/sst/shared/utils/mail.py	2012-03-19 19:20:22 +0000
+++ ubuntuone/web/tests/sst/shared/utils/mail.py	2012-08-10 00:06:19 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011, 2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -21,7 +21,7 @@
 import imaplib
 import time
 from email import email
-from config import IMAP_SERVER, IMAP_USERNAME, IMAP_PASSWORD
+from config import schema
 
 def get_confirmation_code_for_address(email_address):
     email_msg = get_latest_email_sent_to(email_address)
@@ -40,17 +40,27 @@
             raise AssertionError("No verification link found in email.")
     return vcode
 
+
 def get_latest_email_sent_to(email_address):
-    with MailBox(IMAP_USERNAME, IMAP_PASSWORD) as mbox:
+    with MailBox() as mbox:
         email_msg = mbox.get_latest_email_sent_to(email_address)
         mbox.delete_msgs_sent_to(email_address)
         return email_msg
-                            
+                      
+      
 class MailBox(object):
-    def __init__(self, user, password):
-        self.user = user
-        self.password = password
-        self.imap = imaplib.IMAP4_SSL(IMAP_SERVER, 993)
+
+    def __init__(self):
+        config_values = schema.glue.schema_parser.values('NewUser')
+        self.user = config_values.get('imap_username')
+        self.password = config_values.get('imap_password')
+        imap_server = config_values.get('imap_server')
+        imap_port = config_values.get('imap_port')
+        imap_use_ssl = config_values.get('imap_use_ssl')
+        if imap_use_ssl:
+            self.imap = imaplib.IMAP4_SSL(imap_server, imap_port)
+        else:
+            self.imap = imaplib.IMAP4(imap_server, imap_port)
 
     def __enter__(self):
         self.imap.login(self.user, self.password)