unit tests for new code related to thumbnail uploading on create/update passing

Mandy Hampton · Mandy Hampton · commit bc7d40b2bb0e · 2012-07-24T16:56:43.000-05:00
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -557,10 +557,19 @@ def create(self, entity_type, data, return_fields=None):
             upload_filmstrip_image = data.pop('filmstrip_image')
         # end if
 
+        temp_return_fields = [item for item in return_fields]
+        if upload_image and "image" in temp_return_fields:
+            temp_return_fields.remove("image")
+        # end if
+
+        if upload_filmstrip_image and "filmstrip_image" in temp_return_fields:
+            temp_return_fields.remove("filmstrip_image")
+        # end if
+
         params = {
             "type" : entity_type,
             "fields" : self._dict_to_list(data),
-            "return_fields" : return_fields or ["id"]
+            "return_fields" : temp_return_fields or ["id"]
         }
 
         record = self._call_rpc("create", params, first=True)
@@ -570,6 +579,9 @@ def create(self, entity_type, data, return_fields=None):
             image_id = self.upload_thumbnail(entity_type, result['id'],
                                              upload_image)
             result['image_id'] = image_id
+        # end if
+
+        if "image" in return_fields:
             image = self.find_one(entity_type, [['id', 'is', result.get('id')]],
                                   fields=['image'])
             result['image'] = image.get('image')
@@ -578,6 +590,9 @@ def create(self, entity_type, data, return_fields=None):
         if upload_filmstrip_image:
             filmstrip_id = self.upload_filmstrip_thumbnail(entity_type, result['id'], upload_filmstrip_image)
             result['filmstrip_image_id'] = filmstrip_id
+        # end if
+
+        if "filmstrip_image" in return_fields:
             filmstrip = self.find_one(entity_type,
                                       [['id', 'is', result.get('id')]],
                                       fields=['filmstrip_image'])
@@ -1060,7 +1075,7 @@ def download_attachment(self, attachment_id):
         urllib2.install_opener(opener)
 
         url = urlparse.urlunparse((self.config.scheme, self.config.server,
-            "/file_serve/attachment/%s" % urllib.quote(str(attachment_id)),
+            "/file_serve/%s" % urllib.quote(str(attachment_id)),
             None, None, None))
 
         try:
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -174,7 +174,8 @@ def test_create_upload(self):
         size = os.stat(path).st_size
 
         # test thumbnail upload
-        data = {'image': path, 'name': 'Test Version'}
+        data = {'image': path, 'code': 'Test Version',
+                'project': self.project}
         new_version = self.sg.create("Version", data, return_fields=['image'])
         self.assertTrue(new_version is not None)
         self.assertTrue(new_version.get('image') is not None)
@@ -183,26 +184,20 @@ def test_create_upload(self):
             self.sg.download_attachment(new_version.get('image_id'))
         self.assertTrue(attach_file is not None)
         self.assertEqual(size, len(attach_file))
-        orig_file.open(path, "rb").read()
+        orig_file = open(path, "rb").read()
         self.assertEqual(orig_file, attach_file)
 
         # test filmstrip image upload
-        data = {'filmstrip_image': path, 'name': 'Test Version'}
-        new_version = self.sg.create("Version", data, return_fields=['image'])
+        data = {'filmstrip_image': path, 'code': 'Test Version',
+                'project': self.project}
+        new_version = self.sg.create("Version", data, return_fields=['filmstrip_image'])
         self.assertTrue(new_version is not None)
         self.assertTrue(new_version.get('filmstrip_image') is not None)
         self.assertTrue(new_version.get('filmstrip_image_id') is not None)
         attach_file =\
             self.sg.download_attachment(new_version.get('filmstrip_image_id'))
         self.assertTrue(attach_file is not None)
         self.assertEqual(size, len(attach_file))
-        orig_file.open(path, "rb").read()
-        self.assertEqual(orig_file, attach_file)
-            
-        attach_file = self.sg.download_attachment(attach_id)
-        self.assertTrue(attach_file is not None)
-        self.assertEqual(size, len(attach_file))
-        
         orig_file = open(path, "rb").read()
         self.assertEqual(orig_file, attach_file)
     # end test_create_upload
@@ -248,7 +243,6 @@ def test_thumbnail_url(self):
             }
         ]
 
-        print expected, response
         self.assertEqual(expected, response)
 
         response_version_with_project = self.sg.find(
@@ -320,7 +314,6 @@ def test_ensure_unicode(self):
                               self.config.api_key, 
                               ensure_ascii=False)
         result = sg_unicode.find_one('Note', [['id','is',self.note['id']]], fields=['content'])
-        print result
         self.assertTrue(_has_unicode(result))
 
     def test_work_schedule(self):
diff --git a/tests/test_api_long.py b/tests/test_api_long.py
@@ -15,7 +15,8 @@ def test_automated_find(self):
         limit = 1
         page = 1
         for entity_type in all_entities:
-            if entity_type in ("Asset", "Task", "Shot", "Attachment"):
+            if entity_type in ("Asset", "Task", "Shot", "Attachment",
+                               "Candidate"):
                 continue
             print "Finding entity type", entity_type
 
