Merge develop

tests/integration/hosts/aftereffects/lib.py

@@ -6,6 +6,7 @@ from tests.lib.testing_classes import (
     HostFixtures,
     PublishTest,
     DeadlinePublishTest
+
 )
 
 
@@ -49,3 +50,4 @@ class AELocalPublishTestClass(AEHostFixtures, PublishTest):
 
 class AEDeadlinePublishTestClass(AEHostFixtures, DeadlinePublishTest):
     """Testing class for Deadline publishes."""
+

tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py

@@ -62,7 +62,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 4))
 
-        additional_args = {"context.subset": "renderTest_taskMain",
+        additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "aep"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
@@ -70,6 +70,18 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
 
         additional_args = {"context.subset": "renderTest_taskMain",
                            "context.ext": "png"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 2,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "thumbnail"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "png_png"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
                                     additional_args=additional_args))

tests/integration/hosts/maya/lib.py

@@ -55,3 +55,4 @@ class MayaLocalPublishTestClass(MayaHostFixtures, PublishTest):
 
 class MayaDeadlinePublishTestClass(MayaHostFixtures, DeadlinePublishTest):
     """Testing class for Deadline publishes."""
+

tests/integration/hosts/nuke/lib.py

@@ -66,3 +66,4 @@ class NukeLocalPublishTestClass(NukeHostFixtures, PublishTest):
 
 class NukeDeadlinePublishTestClass(NukeHostFixtures, DeadlinePublishTest):
     """Testing class for Deadline publishes."""
+