Merge lp:~elopio/ubuntuone-testing/add-photo into lp:ubuntuone-testing

[Leo Arias]

Added a utility function to create random photos.
Cleaned the add photo test.

Added a utility function to create random photos.
Cleaned the add photo test.

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Philip Fibiger (pfibiger)]

review: Approve

=== renamed file 'ubuntuone/web/tests/sst/photos/u1p001_addphoto.py' => 'ubuntuone/web/tests/sst/photos/u1webp83_addphoto.py'
--- ubuntuone/web/tests/sst/photos/u1p001_addphoto.py	2012-06-19 20:29:12 +0000
+++ ubuntuone/web/tests/sst/photos/u1webp83_addphoto.py	2012-07-16 04:51:46 +0000
@@ -1,33 +1,40 @@
 # -*- coding: utf-8 -*-
-# Copyright 2012 Canonical Ltd - All rights reserved
 
-""" U1P001 Test to upload a photo. """
+# 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 *
+from os import path, remove
 import actions.setup as setup_actions
 import actions.files as files_actions
 import actions.photos as photos_actions
-import os.path
-from data.photos import test_files_path, file_name_orig, file_size
-from data.user import User
-try:
-    from _photopasswords import full_name, email, password
-except:
-    skip('Try adding a _photopasswords.py file to the photos folder if you ' \
-            'expect this to work. Read the README.txt file ;)')
-
-
-test_user = User(full_name, email, password)
-setup_actions.setup(user=test_user)
-files_actions.open()
-file_path_orig = test_files_path + file_name_orig
-file_names = photos_actions.generate_unique_files(test_files_path,
-    file_name_orig, 1)
-file_path_uniq = test_files_path + file_names[0]
-files_actions.upload_file(os.path.abspath(file_path_uniq))
-photos_actions.clean_test_file(os.path.abspath(file_path_uniq))
-files_actions.open()  # refresh because edge is broken.
-files_actions.assert_file_exists(file_names[0])
-assert files_actions.get_file_size(file_names[0]) == file_size
+from utils.randomphotos import make_random_photo_and_return_path 
+import uuid
+import tempfile
+import numpy
+import Image
+
+setup_actions.setup(new_user=False)
+
+random_photo_path = make_random_photo_and_return_path()
+files_actions.open()
+files_actions.upload_file(random_photo_path)
+remove(random_photo_path)
+random_photo_name = path.basename(random_photo_path)
+# XXX refresh because there is a bug in edge server.
+# See https://bugs.launchpad.net/ubuntuone-servers/+bug/1007147
+files_actions.open()
+files_actions.assert_file_exists(random_photo_name)
 photos_actions.open()
-photos_actions.assert_photo_is_displayed_on_gallery(file_names[0])
+photos_actions.assert_photo_present_in_list(random_photo_name)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/photos.py'
--- ubuntuone/web/tests/sst/shared/actions/photos.py	2012-07-16 04:51:46 +0000
+++ ubuntuone/web/tests/sst/shared/actions/photos.py	2012-07-16 04:51:46 +0000
@@ -28,7 +28,6 @@
 def open():
     click_photos_tab()
     switch_to_window()
-    assert_page_title()
 
 
 def click_photos_tab():
@@ -48,6 +47,16 @@
     assert_text(heading1_element, folder_name)
 
 
+def assert_photo_present_in_list(photo_name):
+    photo_element = _get_photo_element_in_list(photo_name)
+    assert_displayed(photo_element)
+
+
+def _get_photo_element_in_list(photo_name):
+    return get_element('.photo-list img.scaled[data-qa-id="%(name)s"]' 
+        % {'name': photo_name})
+
+
 def _get_md5(filename):
     """ get md5 checksum of file 'filename'. """
     m = hashlib.md5()

=== added file 'ubuntuone/web/tests/sst/shared/utils/randomphotos.py'
--- ubuntuone/web/tests/sst/shared/utils/randomphotos.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/utils/randomphotos.py	2012-07-16 04:51:46 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+"""Thanks to heltonbiker for the code to generate the random image.
+See http://stackoverflow.com/a/10901092
+
+As part of the code for this file was copied from stackoverflow, 
+it has a CC-BY-SA 3.0 license.
+
+"""
+
+import numpy
+import Image
+import tempfile
+import uuid
+
+def make_random_photo_and_return_path():
+    photo_uuid = str(uuid.uuid1())
+    photo_path = None
+    random_matrix = numpy.random.rand(200, 200, 3) * 255
+    random_uint8_matrix = random_matrix.astype('uint8')
+    image = Image.fromarray(random_uint8_matrix).convert('RGBA')
+    photo = tempfile.NamedTemporaryFile(mode='wr', prefix='Random photo ',
+        suffix=photo_uuid + '.jpg', delete=False)
+    image.save(photo)
+    photo.close
+    return photo.name