Merge lp:~elopio/ubuntuone-testing/stabilize-files into lp:ubuntuone-testing

[Leo Arias]

Stabilize files tests.

Fixes and clean-ups to stabilize the files tests.

[Rick McBride (rmcbride)]

+1

review: Approve

=== modified file 'config-manager.txt'
--- config-manager.txt	2012-01-18 19:14:02 +0000
+++ config-manager.txt	2012-02-02 00:21:17 +0000
@@ -4,4 +4,4 @@
 #   make clean-sourcedeps update-sourcedeps
 #
 
-./sourcecode/selenium-simple-test        bzr+ssh://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk;revno=224
+./sourcecode/selenium-simple-test        bzr+ssh://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk;revno=256

=== modified file 'ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py'
--- ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py	2011-12-14 00:27:17 +0000
+++ ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py	2012-02-02 00:21:17 +0000
@@ -34,7 +34,7 @@
 file_uuid = str(uuid.uuid1())
 file_contents = 'This is test file %s' % file_uuid
 file_name = None
-with tempfile.NamedTemporaryFile(mode='wr', prefix='Test upload from website',
+with tempfile.NamedTemporaryFile(mode='wr', prefix='New file ',
                                  suffix=file_uuid + '.txt',
                                  delete=False) as upload:
     upload.write(file_contents)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf002_publishfile.py'
--- ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2011-12-14 00:27:17 +0000
+++ ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2012-02-02 00:21:17 +0000
@@ -35,7 +35,7 @@
 file_contents = 'This is test file %s' % file_uuid
 file_name = None
 with tempfile.NamedTemporaryFile(mode='wr',
-                                 prefix='Test publish from website',
+                                 prefix='File to publish ',
                                  suffix=file_uuid + '.txt',
                                  delete=False) as upload:
     upload.write(file_contents)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py'
--- ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2011-12-14 00:27:17 +0000
+++ ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2012-02-02 00:21:17 +0000
@@ -35,7 +35,7 @@
 file_contents = 'This is test file %s' % file_uuid
 file_name = None
 with tempfile.NamedTemporaryFile(mode='wr',
-                                 prefix='Test stop publishing from website',
+                                 prefix='File to stop publishing ',
                                  suffix=file_uuid + '.txt',
                                  delete=False) as upload:
     upload.write(file_contents)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf004_downloadfile.py'
--- ubuntuone/web/tests/sst/files/u1webf004_downloadfile.py	2011-12-14 00:27:17 +0000
+++ ubuntuone/web/tests/sst/files/u1webf004_downloadfile.py	2012-02-02 00:21:17 +0000
@@ -36,7 +36,7 @@
 file_contents = 'This is test file %s' % file_uuid
 file_name = None
 with tempfile.NamedTemporaryFile(mode='wr',
-                                 prefix='Test download from website',
+                                 prefix='File to download ',
                                  suffix=file_uuid + '.txt',
                                  delete=False) as upload:
     upload.write(file_contents)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf005_deletefile.py'
--- ubuntuone/web/tests/sst/files/u1webf005_deletefile.py	2011-11-07 17:14:03 +0000
+++ ubuntuone/web/tests/sst/files/u1webf005_deletefile.py	2012-02-02 00:21:17 +0000
@@ -35,7 +35,7 @@
 file_contents = 'This is test file %s' % file_uuid
 file_name = None
 with tempfile.NamedTemporaryFile(mode='wr',
-                                 prefix='Test delete from website',
+                                 prefix='File to delete ',
                                  suffix=file_uuid + '.txt',
                                  delete=False) as upload:
     upload.write(file_contents)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf006_createfolder.py'
--- ubuntuone/web/tests/sst/files/u1webf006_createfolder.py	2011-10-03 08:50:46 +0000
+++ ubuntuone/web/tests/sst/files/u1webf006_createfolder.py	2012-02-02 00:21:17 +0000
@@ -25,11 +25,12 @@
 from sst.actions import *
 import actions.setup as setup_actions
 import actions.files as files_actions
-from random import random
+import uuid
 
 setup_actions.setup()
 files_actions.open()
-folder_name = 'New Folder %f' % random()
+folder_uuid = str(uuid.uuid1())
+folder_name = 'New folder %s' % folder_uuid
 files_actions.create_new_folder(folder_name)
 files_actions.assert_file_exists(folder_name)
 assert files_actions.get_file_size(folder_name) == ' '

=== modified file 'ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py'
--- ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py	2011-10-04 07:13:54 +0000
+++ ubuntuone/web/tests/sst/files/u1webf007_sharefolder.py	2012-02-02 00:21:17 +0000
@@ -25,17 +25,18 @@
 from sst.actions import *
 import actions.setup as setup_actions
 import actions.files as files_actions
-from random import random
-from datetime import date
+import uuid
+from datetime import datetime
 
 setup_actions.setup()
 files_actions.open()
-folder_name = 'Shared Folder %f' % random()
+folder_uuid = str(uuid.uuid1())
+folder_name = 'Folder to share %s' % folder_uuid
 files_actions.create_new_folder(folder_name)
 files_actions.assert_file_exists(folder_name)
-email_address = '[e-mail]'
+email_address = '[e-mail]' % folder_uuid
 files_actions.share_folder(folder_name, email_address, folder_name)
 files_actions.assert_folder_information_is_shown(folder_name)
 files_actions.assert_folder_shared(folder_name, email_address, 
-                                   date=date.today())
+                                   date=datetime.utcnow())
 

=== modified file 'ubuntuone/web/tests/sst/files/u1webf008_stopsharingfolder.py'
--- ubuntuone/web/tests/sst/files/u1webf008_stopsharingfolder.py	2011-10-03 08:50:46 +0000
+++ ubuntuone/web/tests/sst/files/u1webf008_stopsharingfolder.py	2012-02-02 00:21:17 +0000
@@ -26,16 +26,17 @@
 from sst.actions import *
 import actions.setup as setup_actions
 import actions.files as files_actions
-from random import random
-from datetime import date
+import uuid
+from datetime import datetime
 
 setup_actions.setup()
 files_actions.open()
-folder_name = 'Shared Folder %f' % random()
+folder_uuid = str(uuid.uuid1())
+folder_name = 'Folder to stop sharing %s' % folder_uuid
 files_actions.create_new_folder(folder_name)
 files_actions.assert_file_exists(folder_name)
-email_address = '[e-mail]'
+email_address = '[e-mail]' % folder_uuid
 files_actions.share_folder(folder_name, email_address, folder_name)
-files_actions.stop_sharing_folder(folder_name, email_address, date.today())
-fails(files_actions.assert_folder_shared, folder_name, email_address, 
-      date.today())
+today = datetime.utcnow()
+files_actions.stop_sharing_folder(folder_name, email_address, today)
+fails(files_actions.assert_folder_shared, folder_name, email_address, today)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf009_deletefolder.py'
--- ubuntuone/web/tests/sst/files/u1webf009_deletefolder.py	2011-10-03 08:50:46 +0000
+++ ubuntuone/web/tests/sst/files/u1webf009_deletefolder.py	2012-02-02 00:21:17 +0000
@@ -25,12 +25,12 @@
 from sst.actions import *
 import actions.setup as setup_actions
 import actions.files as files_actions
-from random import random
-from datetime import date
+import uuid
 
 setup_actions.setup()
 files_actions.open()
-folder_name = 'Deleted Folder %f' % random()
+folder_uuid = str(uuid.uuid1())
+folder_name = 'Folder to delete %s' % folder_uuid
 files_actions.create_new_folder(folder_name)
 files_actions.assert_file_exists(folder_name)
 files_actions.delete_file(folder_name)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/files.py'
--- ubuntuone/web/tests/sst/shared/actions/files.py	2011-12-09 18:24:02 +0000
+++ ubuntuone/web/tests/sst/shared/actions/files.py	2012-02-02 00:21:17 +0000
@@ -37,24 +37,6 @@
     """Assert that the title of the page is the expected."""
     assert_title(u'Ubuntu One : My Storage')
 
-def click_upload_file():
-    """Click the Upload file button and wait for the upload overlay 
-    to appear.
-
-    """
-    click_element('upload-file-button', wait=False)
-    upload_overlay = get_element(id='upload-overlay')
-    wait_for(upload_overlay.is_displayed)
-
-def click_new_folder():
-    """Click the New folder link and wait for the new folder overlay
-    to appear.
-    
-    """
-    click_element('new-folder-button', wait=False)
-    new_folder_overlay = get_element(id='new-folder-overlay')
-    wait_for(new_folder_overlay.is_displayed)
-
 def upload_file(path):
     """Upload a file.
 
@@ -69,6 +51,15 @@
     # TODO set a waiting time proportional to the size of the file to upload.
     wait_for_action_to_complete()
 
+def click_upload_file():
+    """Click the Upload file button and wait for the upload overlay 
+    to appear.
+
+    """
+    click_element('upload-file-button', wait=False)
+    upload_overlay = get_element(id='upload-overlay')
+    wait_for(upload_overlay.is_displayed)
+
 def assert_file_exists(name):
     """Assert that a file exists on the Ubuntu One storage.
 
@@ -80,6 +71,29 @@
     get_element_by_xpath('//td[@class="files-td-name" and @id="%(name)s"]'
                          % {'name': name})
 
+def create_new_folder(name):
+    """Create a new folder on the Ubuntu One storage service.
+
+    The folder will be created as a child of the currently selected one.
+
+    Keyword arguments:
+    name -- The name of the folder.
+
+    """
+    click_new_folder()
+    write_textfield('new-folder-overlay-name', name)
+    click_button('new-folder-overlay-create-button')
+    wait_for_action_to_complete()
+
+def click_new_folder():
+    """Click the New folder link and wait for the new folder overlay
+    to appear.
+    
+    """
+    click_element('new-folder-button', wait=False)
+    new_folder_overlay = get_element(id='new-folder-overlay')
+    wait_for(new_folder_overlay.is_displayed)
+
 def get_file_row_element(name):
     """Get the HTML row of a file.
 
@@ -122,6 +136,10 @@
     return element_file_row. \
         find_element_by_xpath('td[@class="files-td-size"]').text
 
+def show_file_details(name):
+    if not _are_details_shown:
+        _click_file_more(name)
+
 def _are_details_shown(name):
     identifier = _get_file_identifier(name)
     element_details = get_element(id='%s-details' % identifier)
@@ -139,9 +157,18 @@
         'td[@class="files-td-expander expand-row-link"]/a')
     click_element(element_more)
 
-def show_file_details(name):
-    if not _are_details_shown:
-        _click_file_more(name)
+def assert_file_information_is_shown(name):
+    """Assert that the full information of a file is shown.
+
+    Keyword arguments:
+    name -- The name of the file.
+
+    """
+    assert _are_details_shown(name)
+    identifier = _get_file_identifier(name)
+    assert _get_link_publish_file(identifier).is_displayed()
+    assert _get_link_download_file(identifier).is_displayed()
+    assert _get_link_delete_file(identifier).is_displayed()
 
 def _get_link_publish_file(identifier):
     """Get the Publish File link element.
@@ -163,7 +190,6 @@
     return get_element(id='%s-publish' % identifier,
                        css_class='u1-files-stop-publishing-link')
 
-
 def _get_link_download_file(identifier):
     """Get the Download file link element.
 
@@ -184,19 +210,6 @@
     """
     return get_element(id='%s-delete' % identifier)
 
-def assert_file_information_is_shown(name):
-    """Assert that the full information of a file is shown.
-
-    Keyword arguments:
-    name -- The name of the file.
-
-    """
-    assert _are_details_shown(name)
-    identifier = _get_file_identifier(name)
-    assert _get_link_publish_file(identifier).is_displayed()
-    assert _get_link_download_file(identifier).is_displayed()
-    assert _get_link_delete_file(identifier).is_displayed()
-
 def assert_file_type(name, type):
     """Assert that the type of a file is the expected.
 
@@ -284,7 +297,6 @@
     _get_link_publish_file(identifier)
     fails(get_public_url, name)
 
-
 def click_download_file(name):
     """Download a file stored on the Ubuntu One service.
 
@@ -306,20 +318,6 @@
     identifier = _get_file_identifier(name)
     return _get_link_download_file(identifier).get_attribute('href')
 
-def create_new_folder(name):
-    """Create a new folder on the Ubuntu One storage service.
-
-    The folder will be created as a child of the currently selected one.
-
-    Keyword arguments:
-    name -- The name of the folder.
-
-    """
-    click_new_folder()
-    write_textfield('new-folder-overlay-name', name)
-    click_button('new-folder-overlay-create-button')
-    wait_for_action_to_complete()
-
 def _get_link_share_folder(identifier):
     """Get the Share folder link element.
 
@@ -418,32 +416,26 @@
     click_button('sharing-overlay-share-button')
     wait_for_action_to_complete()
 
-def _get_shared_with_elements(name):
-    """Get the HTML elements with the information of the shared folder.
-    
-    Keyword arguments:
-    name -- The name of the shared folder.
-    
-    Returns a list with the HTML elements of all the shares for the folder.
-
-    """
-    identifier = _get_file_identifier(name)
-    elements_shared_information = get_elements_by_css('#%s-details '
-                                                      'li.shared-with'
-                                                      % identifier)
-    return elements_shared_information
-
-def _get_shared_with_information(name):
-    """Get the information of the shared folder.
-
-    Keyword arguments:
-    name -- The name of the shared folder.
-    
-    Returns a list with the information of all the shares for the folder.
-
-    """
-    elements_shared_information = _get_shared_with_elements(name)
-    return [element.text for element in elements_shared_information]
+def assert_folder_shared(name, email, date, allow_modification=True,
+                         accepted=False):
+    """Assert that a folder is shared.
+    
+    Keyword arguments:
+    name -- The name of the shared folder.
+    email -- The email address of the person who received the shared folder.
+    date -- The date the folder was shared.
+    allow_modification -- Indicates if the recipient of the shared folder is
+        allowed to modify it. The default value is True.
+    accepted -- Indicates if the folder has been accepted by the recipient.
+        The default value is False.
+
+    """
+    show_file_details(name)
+    expected_shared_information = \
+        _build_shared_information_string(name, email, date, allow_modification,
+                                         accepted)
+    folder_shared_information = _get_shared_with_information(name)
+    assert expected_shared_information in folder_shared_information
 
 def _build_shared_information_string(name, email, date, 
                                     allow_modification=True, accepted=False):
@@ -472,28 +464,56 @@
     shared_information += ' Stop sharing'
     return shared_information
 
-def assert_folder_shared(name, email, date, allow_modification=True,
-                         accepted=False):
-    """Assert that a folder is shared.
-    
+def _get_shared_with_information(name):
+    """Get the information of the shared folder.
+
+    Keyword arguments:
+    name -- The name of the shared folder.
+    
+    Returns a list with the information of all the shares for the folder.
+
+    """
+    elements_shared_information = _get_shared_with_elements(name)
+    return [element.text for element in elements_shared_information]
+
+def _get_shared_with_elements(name):
+    """Get the HTML elements with the information of the shared folder.
+    
+    Keyword arguments:
+    name -- The name of the shared folder.
+    
+    Returns a list with the HTML elements of all the shares for the folder.
+
+    """
+    identifier = _get_file_identifier(name)
+    elements_shared_information = get_elements_by_css('#%s-details '
+                                                      'li.shared-with'
+                                                      % identifier)
+    return elements_shared_information
+
+def stop_sharing_folder(name, email, date, allow_modification=True,
+                        accepted=False):
+    """Stop sharing a folder.
+
     Keyword arguments:
     name -- The name of the shared folder.
     email -- The email address of the person who received the shared folder.
     date -- The date the folder was shared.
-    allow_modification -- Indicates if the recipient of the shared folder is
+    allow_modification -- Indicates if the recipient of the shared folder is 
         allowed to modify it. The default value is True.
     accepted -- Indicates if the folder has been accepted by the recipient.
-        The default value is False.
+        The default value is False.  
 
     """
     show_file_details(name)
-    expected_shared_information = \
-        _build_shared_information_string(name, email, date, allow_modification,
-                                         accepted)
-    folder_shared_information = _get_shared_with_information(name)
-    assert expected_shared_information in folder_shared_information
+    link_stop_sharing = _get_stop_sharing_folder_link(name, email, date, 
+                                                      allow_modification,
+                                                      accepted)
+    click_element(link_stop_sharing, wait=False)
+    accept_alert()
+    wait_for_action_to_complete()
 
-def _get_stop_sharing_folder(name, email, date, allow_modification=True,
+def _get_stop_sharing_folder_link(name, email, date, allow_modification=True,
                         accepted=False):
     """Get the link to stop sharing a folder.
 
@@ -517,27 +537,6 @@
     assert folder_list, 'Stop sharing link not found.'
     return folder_list[0].find_element_by_css_selector('a')
 
-def stop_sharing_folder(name, email, date, allow_modification=True,
-                        accepted=False):
-    """Stop sharing a folder.
-
-    Keyword arguments:
-    name -- The name of the shared folder.
-    email -- The email address of the person who received the shared folder.
-    date -- The date the folder was shared.
-    allow_modification -- Indicates if the recipient of the shared folder is 
-        allowed to modify it. The default value is True.
-    accepted -- Indicates if the folder has been accepted by the recipient.
-        The default value is False.  
-
-    """
-    show_file_details(name)
-    link_stop_sharing = _get_stop_sharing_folder(name, email, date, 
-                                                 allow_modification, accepted)
-    click_element(link_stop_sharing)
-    accept_alert()
-    wait_for_action_to_complete()
-
 def delete_file(name):
     """Delete a file or folder.
 
@@ -548,6 +547,6 @@
     show_file_details(name)
     identifier = _get_file_identifier(name)
     link_delete = _get_link_delete_file(identifier)
-    click_element(link_delete)
+    click_element(link_delete, wait=False)
     accept_alert()
     wait_for_action_to_complete()