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

[Leo Arias]

Select the right files URL, depending on the test environment.

Select the right files URL, depending on the test environment.

[Rick McBride (rmcbride)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

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

=== modified file 'ubuntuone/web/tests/sst/shared/actions/files.py'
--- ubuntuone/web/tests/sst/shared/actions/files.py	2012-02-02 00:15:52 +0000
+++ ubuntuone/web/tests/sst/shared/actions/files.py	2012-03-15 23:18:29 +0000
@@ -22,6 +22,7 @@
 from sst.actions import *
 from sst.actions import _get_elem
 from loading import *
+from config import *
 import urlparse
 
 def open():
@@ -197,9 +198,15 @@
     identifier -- The identifier of the file.
 
     """
-    # TODO the URL should be taken from the config.
-    url = 'https://files.staging.one.ubuntu.com/' + str(identifier[3:])
-    return get_element(css_class='download-button', href=url)
+    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/'
+    file_url = files_url + str(identifier[3:])
+    return get_element(css_class='download-button', href=file_url)
 
 def _get_link_delete_file(identifier):
     """Get the Delete file link element.