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

[Leo Arias]

Added tear down actions for tests.

Unlike firefox, Internet Explorer doesn't use a fresh profile for every test. Thus, it keeps the cache information and if a test leaves a user logged, the next one will start with an open session.
This branch adds tear down actions to clean after every test and leave the session just as when it started. It has a lot of duplication because SST doesn't handle set up and tear down for tests and suites, but this is good enough for us until bug #819427 is fixed. For the same reason, the tear down will not be executed if a test fails, and we will have a cascade of failures on IE. Even though, that's better than what we currently have.

[Rick McBride (rmcbride)]

Cool. Yay IE for not acting like the rest of the kids.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~elopio/ubuntuone-testing/fix-payadditionalstorage has not yet been merged into lp:ubuntuone-testing.

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~elopio/ubuntuone-testing/fix-payadditionalstorage has not yet been merged into lp:ubuntuone-testing.

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~elopio/ubuntuone-testing/fix-payadditionalstorage has not yet been merged into lp:ubuntuone-testing.

=== modified file '.bzrignore'
--- .bzrignore	2011-11-24 05:05:49 +0000
+++ .bzrignore	2012-03-22 03:01:18 +0000
@@ -9,6 +9,7 @@
 passwords.py
 reports/*
 _passwords.py
+_musicpasswords.py
 _localconfig.py
 sourcecode
 results

=== modified file 'ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py'
--- ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2012-03-22 03:01:18 +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,11 +21,19 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.account as account_actions
 from _passwords import full_name, email
+from config import ENVIRONMENT
 
 setup_actions.setup()
 account_actions.open()
 account_actions.assert_account_details(full_name, email)
 account_actions.click_edit_account_details()
-assert_url('https://login.ubuntu.com/')
+url = None
+if ENVIRONMENT == 'staging':
+    url = 'https://login.staging.ubuntu.com'
+else:
+    url = 'https://login.ubuntu.com/'
+assert_url(url)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/contacts/u1webc001_addcontact.py'
--- ubuntuone/web/tests/sst/contacts/u1webc001_addcontact.py	2011-10-19 06:52:00 +0000
+++ ubuntuone/web/tests/sst/contacts/u1webc001_addcontact.py	2012-03-22 03:01:18 +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
@@ -22,10 +22,9 @@
 import uuid
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.contacts as contacts_actions
-from data.contact import Contact
-from data.contact import Name
-from data.contact import Email
+from data.contact import Contact, Name, Email
 
 setup_actions.setup()
 contacts_actions.open()
@@ -36,3 +35,4 @@
 contact = Contact(name, (email,))
 contacts_actions.add_contact(contact)
 contacts_actions.assert_contact_information(contact)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/contacts/u1webc002_editcontact.py'
--- ubuntuone/web/tests/sst/contacts/u1webc002_editcontact.py	2011-10-19 06:52:00 +0000
+++ ubuntuone/web/tests/sst/contacts/u1webc002_editcontact.py	2012-03-22 03:01:18 +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
@@ -22,10 +22,9 @@
 import uuid
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.contacts as contacts_actions
-from data.contact import Contact
-from data.contact import Name
-from data.contact import Email
+from data.contact import Contact, Name, Email
 
 setup_actions.setup()
 contacts_actions.open()
@@ -44,3 +43,4 @@
 # If it were, test will fail because two elements with the same id were found.
 contacts_actions.edit_contact(edited_contact)
 contacts_actions.assert_contact_information(edited_contact)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/contacts/u1webc003_deletecontact.py'
--- ubuntuone/web/tests/sst/contacts/u1webc003_deletecontact.py	2011-10-19 06:52:00 +0000
+++ ubuntuone/web/tests/sst/contacts/u1webc003_deletecontact.py	2012-03-22 03:01:18 +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
@@ -22,10 +22,9 @@
 import uuid
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.contacts as contacts_actions
-from data.contact import Contact
-from data.contact import Name
-from data.contact import Email
+from data.contact import Contact, Name, Email
 
 setup_actions.setup()
 contacts_actions.open()
@@ -40,3 +39,4 @@
 contacts_actions.assert_contact_exists(contact_identifier)
 contacts_actions.delete_contact()
 fails(contacts_actions.assert_contact_exists, contact_identifier)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py'
--- ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py	2012-02-01 23:50:20 +0000
+++ ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 from os import path, remove
 import tempfile
@@ -47,3 +45,4 @@
 assert files_actions.get_file_size(file_name) == '54 bytes'
 files_actions.assert_file_information_is_shown(file_name)
 files_actions.assert_file_type(file_name, 'text/plain')
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf002_publishfile.py'
--- ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2012-02-01 23:50:20 +0000
+++ ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 from os import path, remove
 import tempfile
@@ -47,3 +45,4 @@
 files_actions.assert_file_published(file_name)
 file_url = files_actions.go_to_public_url(file_name)
 assert_text(get_element(tag='body'), file_contents)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py'
--- ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2012-02-01 23:50:20 +0000
+++ ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 from os import path, remove
 import tempfile
@@ -51,3 +49,4 @@
 set_base_url(base_url)
 go_to(path)
 assert_text(get_element(tag='body'), 'Could not locate object')
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf004_downloadfile.py'
--- ubuntuone/web/tests/sst/files/u1webf004_downloadfile.py	2012-02-01 23:50:20 +0000
+++ ubuntuone/web/tests/sst/files/u1webf004_downloadfile.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,12 +21,18 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 from os import path, remove
 import tempfile
 import uuid
 import urlparse
 
+skip('Selenium has no way to download the file. The file has to be ' \
+     'downloaded with something like urllib, but then we required to do ' \
+     'the authentication again. An alternative would be to use a Firefox ' \
+     'profile with autosave to a predefined location, but SST has no easy ' \
+     'way to set a profile, and that will only work for Firefox')
 setup_actions.setup()
 files_actions.open()
 file_uuid = str(uuid.uuid1())
@@ -46,8 +49,4 @@
     remove(upload.name)
 file_url = files_actions.get_download_url(file_name)
 # TODO verify the downloaded file.
-skip('Selenium has no way to download the file. The file has to be ' \
-     'downloaded with something like urllib, but then we required to do ' \
-     'the authentication again. An alternative would be to use a Firefox ' \
-     'profile with autosave to a predefined location, but SST has no easy ' \
-     'way to set a profile, and that will only work for Firefox')
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf005_deletefile.py'
--- ubuntuone/web/tests/sst/files/u1webf005_deletefile.py	2012-02-01 23:50:20 +0000
+++ ubuntuone/web/tests/sst/files/u1webf005_deletefile.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 import os.path
 import tempfile
@@ -45,3 +43,4 @@
 files_actions.assert_file_exists(file_name)
 files_actions.delete_file(file_name)
 fails(files_actions.assert_file_exists, file_name)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf006_createfolder.py'
--- ubuntuone/web/tests/sst/files/u1webf006_createfolder.py	2012-02-01 23:45:02 +0000
+++ ubuntuone/web/tests/sst/files/u1webf006_createfolder.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 import uuid
 
@@ -38,4 +36,4 @@
 files_actions.assert_folder_information_is_shown(folder_name)
 files_actions.open_folder(folder_name)
 files_actions.assert_breadcrumb(folder_name)
-# TODO should it show the gallery link?
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py'
--- ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py	2012-02-02 00:14:57 +0000
+++ ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 import uuid
 from datetime import datetime
@@ -39,4 +37,4 @@
 files_actions.assert_folder_information_is_shown(folder_name)
 files_actions.assert_folder_shared(folder_name, email_address, 
                                    date=datetime.utcnow())
-
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf008_stopsharingfolder.py'
--- ubuntuone/web/tests/sst/files/u1webf008_stopsharingfolder.py	2012-02-02 00:14:57 +0000
+++ ubuntuone/web/tests/sst/files/u1webf008_stopsharingfolder.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -25,6 +22,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 import uuid
 from datetime import datetime
@@ -40,3 +38,4 @@
 today = datetime.utcnow()
 files_actions.stop_sharing_folder(folder_name, email_address, today)
 fails(files_actions.assert_folder_shared, folder_name, email_address, today)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf009_deletefolder.py'
--- ubuntuone/web/tests/sst/files/u1webf009_deletefolder.py	2012-02-02 00:14:57 +0000
+++ ubuntuone/web/tests/sst/files/u1webf009_deletefolder.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 import uuid
 
@@ -35,3 +33,4 @@
 files_actions.assert_file_exists(folder_name)
 files_actions.delete_file(folder_name)
 fails(files_actions.assert_file_exists, folder_name)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/files/u1webf010_foldernavigation.py'
--- ubuntuone/web/tests/sst/files/u1webf010_foldernavigation.py	2011-10-03 08:50:46 +0000
+++ ubuntuone/web/tests/sst/files/u1webf010_foldernavigation.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -25,6 +22,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.files as files_actions
 from random import random
 from datetime import date
@@ -52,3 +50,4 @@
 files_actions.assert_breadcrumb(parent_folder_name, sibling_folder_name)
 files_actions.go_to_breadcrumb()
 files_actions.assert_breadcrumb()
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/music/u1webm001_playsong.py'
--- ubuntuone/web/tests/sst/music/u1webm001_playsong.py	2011-12-18 05:00:51 +0000
+++ ubuntuone/web/tests/sst/music/u1webm001_playsong.py	2012-03-22 03:01:18 +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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.music as music_actions
 from data.song import Song
 from data.user import User
@@ -39,3 +40,4 @@
 music_actions.assert_current_song(song)
 music_actions.assert_player_playing()
 music_actions.assert_player_title(1, 1)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/music/u1webm002_selectartist.py'
--- ubuntuone/web/tests/sst/music/u1webm002_selectartist.py	2011-12-18 14:03:06 +0000
+++ ubuntuone/web/tests/sst/music/u1webm002_selectartist.py	2012-03-22 03:01:18 +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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.music as music_actions
 from data.song import Song
 from data.user import User
@@ -37,3 +38,4 @@
 album = 'Free Film Music (cameronmusic.co.uk)'
 music_actions.select_artist(artist)
 music_actions.assert_artist_albums(artist, [album])
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/music/u1webm003_selectalbum.py'
--- ubuntuone/web/tests/sst/music/u1webm003_selectalbum.py	2011-12-18 14:03:06 +0000
+++ ubuntuone/web/tests/sst/music/u1webm003_selectalbum.py	2012-03-22 03:01:18 +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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.music as music_actions
 from data.song import Song
 from data.user import User
@@ -36,3 +37,4 @@
 song = Song('gentle marimba', 'Alastair Cameron', 'Free Film Music (cameronmusic.co.uk)')
 music_actions.select_album(song.album)
 music_actions.assert_album_songs(song.artist, song.album, [song.title])
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py'
--- ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py	2012-03-15 22:46:55 +0000
+++ ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py	2012-03-22 03:01:18 +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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.dashboard as dashboard_actions
 import actions.files as files_actions
 import actions.contacts as contacts_actions
@@ -30,3 +31,4 @@
 files_actions.open()
 contacts_actions.open()
 dashboard_actions.open()
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py'
--- ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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,6 +20,7 @@
 from config import ENVIRONMENT
 from datetime import date
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
@@ -44,3 +41,4 @@
 get_element(tag='p', text='You are subscribed yearly')
 get_element(tag='span', text='See my subscription')
 get_element(tag='span', text='20GB with Music Streaming')
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py'
--- ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2012-03-22 03:01:18 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
 # Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -23,6 +19,7 @@
 from sst.actions import *
 from config import ENVIRONMENT
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
@@ -38,3 +35,4 @@
 # TODO move this to the module account actions.
 get_element(tag='span', text='5GB with Ubuntu One Free')
 get_element(tag='span', text='20GB from storage add-on')
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py'
--- ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -23,6 +19,7 @@
 from sst.actions import *
 from config import ENVIRONMENT
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
@@ -37,3 +34,4 @@
 payment_actions.confirm_payment_details()
 payment_confirmed_actions.assert_page_title()
 payment_confirmed_actions.assert_failed_payment()
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse001_information.py'
--- ubuntuone/web/tests/sst/services/u1webse001_information.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/services/u1webse001_information.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -22,8 +18,10 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 
 setup_actions.setup()
 services_actions.open()
 services_actions.assert_services_information()
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py'
--- ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -22,6 +18,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 
@@ -30,3 +27,4 @@
 services_actions.buy_music_streaming_monthly()
 payment_actions.assert_page_title()
 payment_actions.assert_monthly_music_streaming_subscription()
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py'
--- ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -22,6 +18,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 
@@ -30,3 +27,4 @@
 services_actions.buy_music_streaming_yearly()
 payment_actions.assert_page_title()
 payment_actions.assert_annually_music_streaming_subscription()
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py'
--- ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -22,6 +18,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 
 setup_actions.setup()
@@ -41,3 +38,4 @@
 click_element('storage-gb')
 sleep(1)
 services_actions.assert_storage(25)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -22,6 +18,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 
@@ -31,3 +28,4 @@
 services_actions.buy_extra_storage_monthly()
 payment_actions.assert_page_title()
 payment_actions.assert_monthly_extra_storage_subscription(5)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -22,6 +18,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.services as services_actions
 import actions.payment as payment_actions
 
@@ -31,3 +28,4 @@
 services_actions.buy_extra_storage_yearly()
 payment_actions.assert_page_title()
 payment_actions.assert_annually_extra_storage_subscription(5)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/session/u1webs002_login.py'
--- ubuntuone/web/tests/sst/session/u1webs002_login.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/session/u1webs002_login.py	2012-03-22 03:01:18 +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,6 +21,7 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 import actions.dashboard as dashboard_actions
 import actions.header as header_actions
 from _passwords import full_name
@@ -29,3 +30,4 @@
 dashboard_actions.assert_page_title()
 header_actions.assert_login(full_name)
 dashboard_actions.assert_welcome_message(full_name)
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/header.py'
--- ubuntuone/web/tests/sst/shared/actions/header.py	2011-12-19 15:35:59 +0000
+++ ubuntuone/web/tests/sst/shared/actions/header.py	2012-03-22 03:01:18 +0000
@@ -24,6 +24,9 @@
 def _get_login_or_sign_up_link():
     return get_element(text='Log in or Sign up')
 
+def is_logged_in():
+    return exists_element(tag='a', text='logout')
+
 def assert_login(full_name):
     _assert_full_name(full_name)
     _get_my_account_link()

=== added file 'ubuntuone/web/tests/sst/shared/actions/teardown.py'
--- ubuntuone/web/tests/sst/shared/actions/teardown.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/actions/teardown.py	2012-03-22 03:01:18 +0000
@@ -0,0 +1,37 @@
+# -*- 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/>.
+
+"""Tear down actions for Ubuntu One sst tests."""
+
+from sst.actions import *
+from sst.actions import browser
+
+import actions.header as header_actions
+import actions.sso as sso_actions
+
+def tear_down():
+    go_to()
+    if header_actions.is_logged_in():
+        _prevent_unsaved_data_confirmation()
+        header_actions.logout()
+        sso_actions.assert_logout()
+
+def _prevent_unsaved_data_confirmation():
+    """The browser might have unsaved data and ask for a confirmation before
+    logging out. This will prevent that dialog to appear.
+
+    """
+    browser.execute_script("window.onbeforeunload = function(e){};")

=== modified file 'ubuntuone/web/tests/sst/smoketest/contactspage.py'
--- ubuntuone/web/tests/sst/smoketest/contactspage.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/smoketest/contactspage.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors:
-#     Rick McBride <[e-mail]>
-#
-# 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
@@ -20,6 +17,7 @@
 '''Check existence of Contacts Page.'''
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 
 setup_actions.setup(new_user=False)
 go_to('/contacts/')
@@ -27,3 +25,4 @@
 get_element(css_class='add-button', text='Add contact')
 # possibly add tests for Desktop, Facebook and Ubuntu One Mobile here or
 # in seperate tests
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/smoketest/filespage.py'
--- ubuntuone/web/tests/sst/smoketest/filespage.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/smoketest/filespage.py	2012-03-22 03:01:18 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors:
-#     Rick McBride <[e-mail]>
-#
-# 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
@@ -20,9 +17,11 @@
 '''Check existence of Files Page.'''
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 
 setup_actions.setup(new_user=False)
 assert_title(u'Ubuntu One : Dashboard')
 go_to('/files/')
 assert_title(u'Ubuntu One : My Storage')
 get_element(css_class='add-button', text='Share this folder')
+teardown_actions.tear_down()

=== modified file 'ubuntuone/web/tests/sst/smoketest/services.py'
--- ubuntuone/web/tests/sst/smoketest/services.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/smoketest/services.py	2012-03-22 03:01:18 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors:
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
-# 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
@@ -19,7 +15,9 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 from sst.actions import *
 import actions.setup as setup_actions
+import actions.teardown as teardown_actions
 
 setup_actions.setup(new_user=False)
 go_to('/services/')
 assert_title(u'Ubuntu One : Services')
+teardown_actions.tear_down()