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

[Leo Arias]

Rolled back, removed the tear down actions.

There is a weird interaction of the tear down actions when multiple tests are run. Revert while finding a solution.

[Rick McBride (rmcbride)]

rollback approved.

review: Approve

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py'
--- ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2012-03-22 01:01:17 +0000
+++ ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2012-03-27 19:18:21 +0000
@@ -21,7 +21,6 @@
 
 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
@@ -36,4 +35,3 @@
 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	2012-03-22 01:20:22 +0000
+++ ubuntuone/web/tests/sst/contacts/u1webc001_addcontact.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,9 +22,10 @@
 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, Name, Email
+from data.contact import Contact
+from data.contact import Name
+from data.contact import Email
 
 setup_actions.setup()
 contacts_actions.open()
@@ -35,4 +36,3 @@
 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	2012-03-22 01:20:22 +0000
+++ ubuntuone/web/tests/sst/contacts/u1webc002_editcontact.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,9 +22,10 @@
 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, Name, Email
+from data.contact import Contact
+from data.contact import Name
+from data.contact import Email
 
 setup_actions.setup()
 contacts_actions.open()
@@ -43,4 +44,3 @@
 # 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	2012-03-22 01:20:22 +0000
+++ ubuntuone/web/tests/sst/contacts/u1webc003_deletecontact.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,9 +22,10 @@
 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, Name, Email
+from data.contact import Contact
+from data.contact import Name
+from data.contact import Email
 
 setup_actions.setup()
 contacts_actions.open()
@@ -39,4 +40,3 @@
 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-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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 +24,6 @@
 
 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
@@ -45,4 +47,3 @@
 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-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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 +24,6 @@
 
 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
@@ -45,4 +47,3 @@
 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-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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 +24,6 @@
 
 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
@@ -49,4 +51,3 @@
 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-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf004_downloadfile.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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,18 +24,12 @@
 
 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())
@@ -49,4 +46,8 @@
     remove(upload.name)
 file_url = files_actions.get_download_url(file_name)
 # TODO verify the downloaded file.
-teardown_actions.tear_down()
+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')

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

=== modified file 'ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py'
--- ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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 +24,6 @@
 
 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
@@ -37,4 +39,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-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf008_stopsharingfolder.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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,7 +25,6 @@
 
 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
@@ -38,4 +40,3 @@
 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-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf009_deletefolder.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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 +24,6 @@
 
 from sst.actions import *
 import actions.setup as setup_actions
-import actions.teardown as teardown_actions
 import actions.files as files_actions
 import uuid
 
@@ -33,4 +35,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/files/u1webf010_foldernavigation.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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,7 +25,6 @@
 
 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
@@ -50,4 +52,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/music/u1webm001_playsong.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,6 @@
 
 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
@@ -40,4 +39,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/music/u1webm002_selectartist.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,6 @@
 
 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
@@ -38,4 +37,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/music/u1webm003_selectalbum.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,6 @@
 
 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,4 +36,3 @@
 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-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,6 @@
 
 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
@@ -31,4 +30,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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,7 +24,6 @@
 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
@@ -41,4 +44,3 @@
 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 02:55:32 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2012-03-27 19:18:21 +0000
@@ -1,5 +1,9 @@
 # -*- 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
@@ -19,7 +23,6 @@
 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
@@ -35,4 +38,3 @@
 # 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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 +23,6 @@
 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
@@ -34,4 +37,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/services/u1webse001_information.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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
@@ -18,10 +22,8 @@
 
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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
@@ -18,7 +22,6 @@
 
 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
 
@@ -27,4 +30,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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
@@ -18,7 +22,6 @@
 
 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
 
@@ -27,4 +30,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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
@@ -18,7 +22,6 @@
 
 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()
@@ -38,4 +41,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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
@@ -18,7 +22,6 @@
 
 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
 
@@ -28,4 +31,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors: 
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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
@@ -18,7 +22,6 @@
 
 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
 
@@ -28,4 +31,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/session/u1webs002_login.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011 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,6 @@
 
 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
@@ -30,4 +29,3 @@
 dashboard_actions.assert_page_title()
 header_actions.assert_login(full_name)
 dashboard_actions.assert_welcome_message(full_name)
-teardown_actions.tear_down()

=== removed file 'ubuntuone/web/tests/sst/shared/actions/teardown.py'
--- ubuntuone/web/tests/sst/shared/actions/teardown.py	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/shared/actions/teardown.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# -*- 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/smoketest/contactspage.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors:
+#     Rick McBride <[e-mail]>
+#
+# Copyright 2011 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
@@ -17,7 +20,6 @@
 '''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/')
@@ -25,4 +27,3 @@
 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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/smoketest/filespage.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors:
+#     Rick McBride <[e-mail]>
+#
+# Copyright 2011 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
@@ -17,11 +20,9 @@
 '''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	2012-03-22 02:55:32 +0000
+++ ubuntuone/web/tests/sst/smoketest/services.py	2012-03-27 19:18:21 +0000
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011-2012 Canonical Ltd.
+# Authors:
+#     Rick McBride <[e-mail]>
+#     Leo Arias <[e-mail]>
+#
+# Copyright 2011 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
@@ -15,9 +19,7 @@
 # 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()