From 412d03d382aef31769f3d6f61e6ec70fa53fda6d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 2 Dec 2022 15:52:04 +0100
Subject: [PATCH] Merge fixes for tests from branch with Deadline tests.

Branch with newly implemented DL tests is targetted to release 3.15, but changes from it affects tests in develop.
This branch should solve issues with automatic tests in develop without need of full release 3.15 changes.
---
 tests/README.md                               |  10 +++
 tests/conftest.py                             |  12 +++
 tests/integration/hosts/aftereffects/lib.py   |  22 ++++--
 .../test_publish_in_aftereffects.py           |  34 ++++++---
 ...test_publish_in_aftereffects_multiframe.py |  36 ++++++---
 tests/integration/hosts/maya/lib.py           |  19 ++++-
 .../hosts/maya/test_publish_in_maya.py        |  57 ++++++++------
 tests/integration/hosts/nuke/lib.py           |  31 ++++++--
 .../hosts/nuke/test_publish_in_nuke.py        |  25 +++++--
 tests/integration/hosts/photoshop/lib.py      |  11 ++-
 .../photoshop/test_publish_in_photoshop.py    |   6 +-
 tests/lib/db_handler.py                       |  23 +++---
 tests/lib/testing_classes.py                  |  70 ++++++++++++++----
 tests/resources/test_data.zip                 | Bin 7350 -> 5098 bytes
 tests/unit/igniter/test_bootstrap_repos.py    |  30 ++++----
 15 files changed, 275 insertions(+), 111 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 69828cdbc2..d36b6534f8 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,5 +1,15 @@
 Automatic tests for OpenPype
 ============================
+
+Requirements:
+============
+Tests are recreating fresh DB for each run, so `mongorestore`, `mongodump` and `mongoimport` command line tools must be installed and on Path.
+
+You can find intallers here: https://www.mongodb.com/docs/database-tools/installation/installation/
+
+You can test that `mongorestore` is available by running this in console, or cmd:
+```mongorestore --version```
+
 Structure:
 - integration - end to end tests, slow (see README.md in the integration folder for more info)
     - openpype/modules/MODULE_NAME - structure follow directory structure in code base
diff --git a/tests/conftest.py b/tests/conftest.py
index aa850be1a6..7b58b0314d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -43,3 +43,15 @@ def app_variant(request):
 @pytest.fixture(scope="module")
 def timeout(request):
     return request.config.getoption("--timeout")
+
+
+@pytest.hookimpl(tryfirst=True, hookwrapper=True)
+def pytest_runtest_makereport(item, call):
+    # execute all other hooks to obtain the report object
+    outcome = yield
+    rep = outcome.get_result()
+
+    # set a report attribute for each phase of a call, which can
+    # be "setup", "call", "teardown"
+
+    setattr(item, "rep_" + rep.when, rep)
diff --git a/tests/integration/hosts/aftereffects/lib.py b/tests/integration/hosts/aftereffects/lib.py
index 9fffc6073d..ffad33d13c 100644
--- a/tests/integration/hosts/aftereffects/lib.py
+++ b/tests/integration/hosts/aftereffects/lib.py
@@ -2,10 +2,13 @@ import os
 import pytest
 import shutil
 
-from tests.lib.testing_classes import HostFixtures
+from tests.lib.testing_classes import (
+    HostFixtures,
+    PublishTest,
+)
 
 
-class AfterEffectsTestClass(HostFixtures):
+class AEHostFixtures(HostFixtures):
     @pytest.fixture(scope="module")
     def last_workfile_path(self, download_test_data, output_folder_url):
         """Get last_workfile_path from source data.
@@ -15,15 +18,15 @@ class AfterEffectsTestClass(HostFixtures):
         src_path = os.path.join(download_test_data,
                                 "input",
                                 "workfile",
-                                "test_project_test_asset_TestTask_v001.aep")
-        dest_folder = os.path.join(download_test_data,
+                                "test_project_test_asset_test_task_v001.aep")
+        dest_folder = os.path.join(output_folder_url,
                                    self.PROJECT,
                                    self.ASSET,
                                    "work",
                                    self.TASK)
         os.makedirs(dest_folder)
         dest_path = os.path.join(dest_folder,
-                                 "test_project_test_asset_TestTask_v001.aep")
+                                 "test_project_test_asset_test_task_v001.aep")
         shutil.copy(src_path, dest_path)
 
         yield dest_path
@@ -32,3 +35,12 @@ class AfterEffectsTestClass(HostFixtures):
     def startup_scripts(self, monkeypatch_session, download_test_data):
         """Points Maya to userSetup file from input data"""
         pass
+
+    @pytest.fixture(scope="module")
+    def skip_compare_folders(self):
+        # skip folder that contain "Logs", these come only from Deadline
+        return ["Logs", "Auto-Save"]
+
+
+class AELocalPublishTestClass(AEHostFixtures, PublishTest):
+    """Testing class for local publishes."""
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
index 4925cbd2d7..57d5a3e3f1 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
@@ -1,12 +1,12 @@
 import logging
 
 from tests.lib.assert_classes import DBAssert
-from tests.integration.hosts.aftereffects.lib import AfterEffectsTestClass
+from tests.integration.hosts.aftereffects.lib import AELocalPublishTestClass
 
 log = logging.getLogger("test_publish_in_aftereffects")
 
 
-class TestPublishInAfterEffects(AfterEffectsTestClass):
+class TestPublishInAfterEffects(AELocalPublishTestClass):
     """Basic test case for publishing in AfterEffects
 
         Uses generic TestCase to prepare fixtures for test data, testing DBs,
@@ -32,10 +32,10 @@ class TestPublishInAfterEffects(AfterEffectsTestClass):
          "")
     ]
 
-    APP = "aftereffects"
+    APP_GROUP = "aftereffects"
     APP_VARIANT = ""
 
-    APP_NAME = "{}/{}".format(APP, APP_VARIANT)
+    APP_NAME = "{}/{}".format(APP_GROUP, APP_VARIANT)
 
     TIMEOUT = 120  # publish timeout
 
@@ -49,27 +49,41 @@ class TestPublishInAfterEffects(AfterEffectsTestClass):
         failures.append(
             DBAssert.count_of_types(dbcon, "version", 0, name={"$ne": 1}))
 
-        failures.append(
-            DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="imageMainBackgroundcopy"))
-
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
                                     name="workfileTest_task"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="reviewTesttask"))
+                                    name="renderTest_taskMain"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 4))
 
-        additional_args = {"context.subset": "renderTestTaskDefault",
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "context.ext": "aep"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
                            "context.ext": "png"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
                                     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))
+
         assert not any(failures)
 
 
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
index c882e0f9b2..2d95eada99 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
@@ -1,15 +1,15 @@
 import logging
 
 from tests.lib.assert_classes import DBAssert
-from tests.integration.hosts.aftereffects.lib import AfterEffectsTestClass
+from tests.integration.hosts.aftereffects.lib import AELocalPublishTestClass
 
 log = logging.getLogger("test_publish_in_aftereffects")
 
 
-class TestPublishInAfterEffects(AfterEffectsTestClass):
+class TestPublishInAfterEffects(AELocalPublishTestClass):
     """Basic test case for publishing in AfterEffects
 
-    Should publish 5 frames
+    Should publish 10 frames
     """
     PERSIST = True
 
@@ -19,10 +19,10 @@ class TestPublishInAfterEffects(AfterEffectsTestClass):
          "")
     ]
 
-    APP = "aftereffects"
+    APP_GROUP = "aftereffects"
     APP_VARIANT = ""
 
-    APP_NAME = "{}/{}".format(APP, APP_VARIANT)
+    APP_NAME = "{}/{}".format(APP_GROUP, APP_VARIANT)
 
     TIMEOUT = 120  # publish timeout
 
@@ -36,27 +36,41 @@ class TestPublishInAfterEffects(AfterEffectsTestClass):
         failures.append(
             DBAssert.count_of_types(dbcon, "version", 0, name={"$ne": 1}))
 
-        failures.append(
-            DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="imageMainBackgroundcopy"))
-
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
                                     name="workfileTest_task"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="reviewTesttask"))
+                                    name="renderTest_taskMain"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 4))
 
-        additional_args = {"context.subset": "renderTestTaskDefault",
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "context.ext": "aep"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
                            "context.ext": "png"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
                                     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": "h264_png"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
         assert not any(failures)
 
 
diff --git a/tests/integration/hosts/maya/lib.py b/tests/integration/hosts/maya/lib.py
index f3a438c065..ab402f36e0 100644
--- a/tests/integration/hosts/maya/lib.py
+++ b/tests/integration/hosts/maya/lib.py
@@ -2,10 +2,13 @@ import os
 import pytest
 import shutil
 
-from tests.lib.testing_classes import HostFixtures
+from tests.lib.testing_classes import (
+    HostFixtures,
+    PublishTest,
+)
 
 
-class MayaTestClass(HostFixtures):
+class MayaHostFixtures(HostFixtures):
     @pytest.fixture(scope="module")
     def last_workfile_path(self, download_test_data, output_folder_url):
         """Get last_workfile_path from source data.
@@ -15,7 +18,7 @@ class MayaTestClass(HostFixtures):
         src_path = os.path.join(download_test_data,
                                 "input",
                                 "workfile",
-                                "test_project_test_asset_TestTask_v001.mb")
+                                "test_project_test_asset_test_task_v001.mb")
         dest_folder = os.path.join(output_folder_url,
                                    self.PROJECT,
                                    self.ASSET,
@@ -23,7 +26,7 @@ class MayaTestClass(HostFixtures):
                                    self.TASK)
         os.makedirs(dest_folder)
         dest_path = os.path.join(dest_folder,
-                                 "test_project_test_asset_TestTask_v001.mb")
+                                 "test_project_test_asset_test_task_v001.mb")
         shutil.copy(src_path, dest_path)
 
         yield dest_path
@@ -39,3 +42,11 @@ class MayaTestClass(HostFixtures):
                                    "{}{}{}".format(startup_path,
                                                    os.pathsep,
                                                    original_pythonpath))
+
+    @pytest.fixture(scope="module")
+    def skip_compare_folders(self):
+        yield []
+
+
+class MayaLocalPublishTestClass(MayaHostFixtures, PublishTest):
+    """Testing class for local publishes."""
diff --git a/tests/integration/hosts/maya/test_publish_in_maya.py b/tests/integration/hosts/maya/test_publish_in_maya.py
index 68b0564428..b7ee228aae 100644
--- a/tests/integration/hosts/maya/test_publish_in_maya.py
+++ b/tests/integration/hosts/maya/test_publish_in_maya.py
@@ -1,7 +1,8 @@
-from tests.integration.hosts.maya.lib import MayaTestClass
+from tests.lib.assert_classes import DBAssert
+from tests.integration.hosts.maya.lib import MayaLocalPublishTestClass
 
 
-class TestPublishInMaya(MayaTestClass):
+class TestPublishInMaya(MayaLocalPublishTestClass):
     """Basic test case for publishing in Maya
 
         Shouldnt be running standalone only via 'runtests' pype command! (??)
@@ -28,7 +29,7 @@ class TestPublishInMaya(MayaTestClass):
         ("1BTSIIULJTuDc8VvXseuiJV_fL6-Bu7FP", "test_maya_publish.zip", "")
     ]
 
-    APP = "maya"
+    APP_GROUP = "maya"
     # keep empty to locate latest installed variant or explicit
     APP_VARIANT = ""
 
@@ -37,33 +38,41 @@ class TestPublishInMaya(MayaTestClass):
     def test_db_asserts(self, dbcon, publish_finished):
         """Host and input data dependent expected results in DB."""
         print("test_db_asserts")
-        assert 5 == dbcon.count_documents({"type": "version"}), \
-            "Not expected no of versions"
+        failures = []
+        failures.append(DBAssert.count_of_types(dbcon, "version", 2))
 
-        assert 0 == dbcon.count_documents({"type": "version",
-                                           "name": {"$ne": 1}}), \
-            "Only versions with 1 expected"
+        failures.append(
+            DBAssert.count_of_types(dbcon, "version", 0, name={"$ne": 1}))
 
-        assert 1 == dbcon.count_documents({"type": "subset",
-                                           "name": "modelMain"}), \
-            "modelMain subset must be present"
+        failures.append(
+            DBAssert.count_of_types(dbcon, "subset", 1,
+                                    name="modelMain"))
 
-        assert 1 == dbcon.count_documents({"type": "subset",
-                                           "name": "workfileTest_task"}), \
-            "workfileTest_task subset must be present"
+        failures.append(
+            DBAssert.count_of_types(dbcon, "subset", 1,
+                                    name="workfileTest_task"))
 
-        assert 11 == dbcon.count_documents({"type": "representation"}), \
-            "Not expected no of representations"
+        failures.append(DBAssert.count_of_types(dbcon, "representation", 5))
 
-        assert 2 == dbcon.count_documents({"type": "representation",
-                                           "context.subset": "modelMain",
-                                           "context.ext": "abc"}), \
-            "Not expected no of representations with ext 'abc'"
+        additional_args = {"context.subset": "modelMain",
+                           "context.ext": "abc"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 2,
+                                    additional_args=additional_args))
 
-        assert 2 == dbcon.count_documents({"type": "representation",
-                                           "context.subset": "modelMain",
-                                           "context.ext": "ma"}), \
-            "Not expected no of representations with ext 'abc'"
+        additional_args = {"context.subset": "modelMain",
+                           "context.ext": "ma"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 2,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "workfileTest_task",
+                           "context.ext": "mb"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        assert not any(failures)
 
 
 if __name__ == "__main__":
diff --git a/tests/integration/hosts/nuke/lib.py b/tests/integration/hosts/nuke/lib.py
index d3c3d7ba81..baff675da7 100644
--- a/tests/integration/hosts/nuke/lib.py
+++ b/tests/integration/hosts/nuke/lib.py
@@ -1,17 +1,20 @@
 import os
 import pytest
-import shutil
+import re
 
-from tests.lib.testing_classes import HostFixtures
+from tests.lib.testing_classes import (
+    HostFixtures,
+    PublishTest,
+)
 
 
-class NukeTestClass(HostFixtures):
+class NukeHostFixtures(HostFixtures):
     @pytest.fixture(scope="module")
     def last_workfile_path(self, download_test_data, output_folder_url):
         """Get last_workfile_path from source data.
 
         """
-        source_file_name = "test_project_test_asset_CompositingInNuke_v001.nk"
+        source_file_name = "test_project_test_asset_test_task_v001.nk"
         src_path = os.path.join(download_test_data,
                                 "input",
                                 "workfile",
@@ -27,7 +30,16 @@ class NukeTestClass(HostFixtures):
         dest_path = os.path.join(dest_folder,
                                  source_file_name)
 
-        shutil.copy(src_path, dest_path)
+        # rewrite old root with temporary file
+        # TODO - using only C:/projects seems wrong - but where to get root ?
+        replace_pattern = re.compile(re.escape("C:/projects"), re.IGNORECASE)
+        with open(src_path, "r") as fp:
+            updated = fp.read()
+            updated = replace_pattern.sub(output_folder_url.replace("\\", '/'),
+                                          updated)
+
+        with open(dest_path, "w") as fp:
+            fp.write(updated)
 
         yield dest_path
 
@@ -41,4 +53,11 @@ class NukeTestClass(HostFixtures):
         monkeypatch_session.setenv("NUKE_PATH",
                                    "{}{}{}".format(startup_path,
                                                    os.pathsep,
-                                                   original_nuke_path))
\ No newline at end of file
+                                                   original_nuke_path))
+
+    @pytest.fixture(scope="module")
+    def skip_compare_folders(self):
+        yield []
+
+class NukeLocalPublishTestClass(NukeHostFixtures, PublishTest):
+    """Testing class for local publishes."""
diff --git a/tests/integration/hosts/nuke/test_publish_in_nuke.py b/tests/integration/hosts/nuke/test_publish_in_nuke.py
index 884160e0b5..f84f13fa20 100644
--- a/tests/integration/hosts/nuke/test_publish_in_nuke.py
+++ b/tests/integration/hosts/nuke/test_publish_in_nuke.py
@@ -1,17 +1,25 @@
 import logging
 
 from tests.lib.assert_classes import DBAssert
-from tests.integration.hosts.nuke.lib import NukeTestClass
+from tests.integration.hosts.nuke.lib import NukeLocalPublishTestClass
 
 log = logging.getLogger("test_publish_in_nuke")
 
 
-class TestPublishInNuke(NukeTestClass):
+class TestPublishInNuke(NukeLocalPublishTestClass):
     """Basic test case for publishing in Nuke
 
         Uses generic TestCase to prepare fixtures for test data, testing DBs,
         env vars.
 
+        !!!
+        It expects modified path in WriteNode,
+        use '[python {nuke.script_directory()}]' instead of regular root
+        dir (eg. instead of `c:/projects/test_project/test_asset/test_task`).
+        Access file path by selecting WriteNode group, CTRL+Enter, update file
+        input
+        !!!
+
         Opens Nuke, run publish on prepared workile.
 
         Then checks content of DB (if subset, version, representations were
@@ -20,7 +28,8 @@ class TestPublishInNuke(NukeTestClass):
 
         How to run:
         (in cmd with activated {OPENPYPE_ROOT}/.venv)
-        {OPENPYPE_ROOT}/.venv/Scripts/python.exe {OPENPYPE_ROOT}/start.py runtests ../tests/integration/hosts/nuke  # noqa: E501
+        {OPENPYPE_ROOT}/.venv/Scripts/python.exe {OPENPYPE_ROOT}/start.py
+        runtests ../tests/integration/hosts/nuke  # noqa: E501
 
         To check log/errors from launched app's publish process keep PERSIST
         to True and check `test_openpype.logs` collection.
@@ -30,14 +39,14 @@ class TestPublishInNuke(NukeTestClass):
         ("1SUurHj2aiQ21ZIMJfGVBI2KjR8kIjBGI", "test_Nuke_publish.zip", "")
     ]
 
-    APP = "nuke"
+    APP_GROUP = "nuke"
 
-    TIMEOUT = 120  # publish timeout
+    TIMEOUT = 50  # publish timeout
 
     # could be overwritten by command line arguments
     # keep empty to locate latest installed variant or explicit
     APP_VARIANT = ""
-    PERSIST = True  # True - keep test_db, test_openpype, outputted test files
+    PERSIST = False  # True - keep test_db, test_openpype, outputted test files
     TEST_DATA_FOLDER = None
 
     def test_db_asserts(self, dbcon, publish_finished):
@@ -52,7 +61,7 @@ class TestPublishInNuke(NukeTestClass):
 
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="renderCompositingInNukeMain"))
+                                    name="renderTest_taskMain"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
@@ -61,7 +70,7 @@ class TestPublishInNuke(NukeTestClass):
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 4))
 
-        additional_args = {"context.subset": "renderCompositingInNukeMain",
+        additional_args = {"context.subset": "renderTest_taskMain",
                            "context.ext": "exr"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
diff --git a/tests/integration/hosts/photoshop/lib.py b/tests/integration/hosts/photoshop/lib.py
index 16ef2d3ae6..9d51a11c06 100644
--- a/tests/integration/hosts/photoshop/lib.py
+++ b/tests/integration/hosts/photoshop/lib.py
@@ -2,10 +2,13 @@ import os
 import pytest
 import shutil
 
-from tests.lib.testing_classes import HostFixtures
+from tests.lib.testing_classes import (
+    HostFixtures,
+    PublishTest
+)
 
 
-class PhotoshopTestClass(HostFixtures):
+class PhotoshopTestClass(HostFixtures, PublishTest):
     @pytest.fixture(scope="module")
     def last_workfile_path(self, download_test_data, output_folder_url):
         """Get last_workfile_path from source data.
@@ -32,3 +35,7 @@ class PhotoshopTestClass(HostFixtures):
     def startup_scripts(self, monkeypatch_session, download_test_data):
         """Points Maya to userSetup file from input data"""
         pass
+
+    @pytest.fixture(scope="module")
+    def skip_compare_folders(self):
+        yield []
diff --git a/tests/integration/hosts/photoshop/test_publish_in_photoshop.py b/tests/integration/hosts/photoshop/test_publish_in_photoshop.py
index 5387bbe51e..4aaf43234d 100644
--- a/tests/integration/hosts/photoshop/test_publish_in_photoshop.py
+++ b/tests/integration/hosts/photoshop/test_publish_in_photoshop.py
@@ -41,11 +41,11 @@ class TestPublishInPhotoshop(PhotoshopTestClass):
         ("1zD2v5cBgkyOm_xIgKz3WKn8aFB_j8qC-", "test_photoshop_publish.zip", "")
     ]
 
-    APP = "photoshop"
+    APP_GROUP = "photoshop"
     # keep empty to locate latest installed variant or explicit
     APP_VARIANT = ""
 
-    APP_NAME = "{}/{}".format(APP, APP_VARIANT)
+    APP_NAME = "{}/{}".format(APP_GROUP, APP_VARIANT)
 
     TIMEOUT = 120  # publish timeout
 
@@ -72,7 +72,7 @@ class TestPublishInPhotoshop(PhotoshopTestClass):
                                     name="workfileTest_task"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 8))
+            DBAssert.count_of_types(dbcon, "representation", 6))
 
         additional_args = {"context.subset": "imageMainForeground",
                            "context.ext": "png"}
diff --git a/tests/lib/db_handler.py b/tests/lib/db_handler.py
index b181055012..82e741cc3b 100644
--- a/tests/lib/db_handler.py
+++ b/tests/lib/db_handler.py
@@ -118,9 +118,8 @@ class DBHandler:
                                    "Run with overwrite=True")
             else:
                 if collection:
-                    coll = self.client[db_name_out].get(collection)
-                    if coll:
-                        coll.drop()
+                    if collection in self.client[db_name_out].list_collection_names():  # noqa
+                        self.client[db_name_out][collection].drop()
                 else:
                     self.teardown(db_name_out)
 
@@ -133,7 +132,11 @@ class DBHandler:
                                     db_name=db_name, db_name_out=db_name_out,
                                     collection=collection)
         print("mongorestore query:: {}".format(query))
-        subprocess.run(query)
+        try:
+            subprocess.run(query)
+        except FileNotFoundError:
+            raise RuntimeError("'mongorestore' utility must be on path."
+                               "Please install it.")
 
     def teardown(self, db_name):
         """Drops 'db_name' if exists."""
@@ -231,13 +234,15 @@ class DBHandler:
 # Examples
 # handler = DBHandler(uri="mongodb://localhost:27017")
 # #
-# backup_dir = "c:\\projects\\test_nuke_publish\\input\\dumps"
+# backup_dir = "c:\\projects\\test_zips\\test_nuke_deadline_publish\\input\\dumps"  # noqa
 # # #
-# handler.backup_to_dump("avalon", backup_dir, True, collection="test_project")
-# handler.setup_from_dump("test_db", backup_dir, True, db_name_out="avalon", collection="test_project")
-# handler.setup_from_sql_file("test_db", "c:\\projects\\sql\\item.sql",
+# handler.backup_to_dump("avalon_tests", backup_dir, True, collection="test_project")  # noqa
+#handler.backup_to_dump("openpype_tests", backup_dir, True, collection="settings")  # noqa
+
+# handler.setup_from_dump("avalon_tests", backup_dir, True, db_name_out="avalon_tests", collection="test_project")  # noqa
+# handler.setup_from_sql_file("avalon_tests", "c:\\projects\\sql\\item.sql",
 #                             collection="test_project",
 #                             drop=False, mode="upsert")
-# handler.setup_from_sql("test_db", "c:\\projects\\sql",
+# handler.setup_from_sql("avalon_tests", "c:\\projects\\sql",
 #                        collection="test_project",
 #                        drop=False, mode="upsert")
diff --git a/tests/lib/testing_classes.py b/tests/lib/testing_classes.py
index 78a9f81095..5e3b11cfc9 100644
--- a/tests/lib/testing_classes.py
+++ b/tests/lib/testing_classes.py
@@ -8,9 +8,12 @@ import tempfile
 import shutil
 import glob
 import platform
+import requests
+import re
 
 from tests.lib.db_handler import DBHandler
 from common.openpype_common.distribution.file_handler import RemoteFileHandler
+from openpype.modules import ModulesManager
 
 
 class BaseTest:
@@ -36,9 +39,9 @@ class ModuleUnitTest(BaseTest):
     PERSIST = False  # True to not purge temporary folder nor test DB
 
     TEST_OPENPYPE_MONGO = "mongodb://localhost:27017"
-    TEST_DB_NAME = "test_db"
+    TEST_DB_NAME = "avalon_tests"
     TEST_PROJECT_NAME = "test_project"
-    TEST_OPENPYPE_NAME = "test_openpype"
+    TEST_OPENPYPE_NAME = "openpype_tests"
 
     TEST_FILES = []
 
@@ -57,7 +60,7 @@ class ModuleUnitTest(BaseTest):
         m.undo()
 
     @pytest.fixture(scope="module")
-    def download_test_data(self, test_data_folder, persist=False):
+    def download_test_data(self, test_data_folder, persist, request):
         test_data_folder = test_data_folder or self.TEST_DATA_FOLDER
         if test_data_folder:
             print("Using existing folder {}".format(test_data_folder))
@@ -78,7 +81,8 @@ class ModuleUnitTest(BaseTest):
                 print("Temporary folder created:: {}".format(tmpdir))
                 yield tmpdir
 
-                persist = persist or self.PERSIST
+                persist = (persist or self.PERSIST or
+                           self.is_test_failed(request))
                 if not persist:
                     print("Removing {}".format(tmpdir))
                     shutil.rmtree(tmpdir)
@@ -125,7 +129,8 @@ class ModuleUnitTest(BaseTest):
         monkeypatch_session.setenv("TEST_SOURCE_FOLDER", download_test_data)
 
     @pytest.fixture(scope="module")
-    def db_setup(self, download_test_data, env_var, monkeypatch_session):
+    def db_setup(self, download_test_data, env_var, monkeypatch_session,
+                 request):
         """Restore prepared MongoDB dumps into selected DB."""
         backup_dir = os.path.join(download_test_data, "input", "dumps")
 
@@ -135,13 +140,14 @@ class ModuleUnitTest(BaseTest):
                                    overwrite=True,
                                    db_name_out=self.TEST_DB_NAME)
 
-        db_handler.setup_from_dump("openpype", backup_dir,
+        db_handler.setup_from_dump(self.TEST_OPENPYPE_NAME, backup_dir,
                                    overwrite=True,
                                    db_name_out=self.TEST_OPENPYPE_NAME)
 
         yield db_handler
 
-        if not self.PERSIST:
+        persist = self.PERSIST or self.is_test_failed(request)
+        if not persist:
             db_handler.teardown(self.TEST_DB_NAME)
             db_handler.teardown(self.TEST_OPENPYPE_NAME)
 
@@ -166,6 +172,13 @@ class ModuleUnitTest(BaseTest):
         mongo_client = OpenPypeMongoConnection.get_mongo_client()
         yield mongo_client[self.TEST_OPENPYPE_NAME]["settings"]
 
+    def is_test_failed(self, request):
+        # if request.node doesn't have rep_call, something failed
+        try:
+            return request.node.rep_call.failed
+        except AttributeError:
+            return True
+
 
 class PublishTest(ModuleUnitTest):
     """Test class for publishing in hosts.
@@ -188,7 +201,7 @@ class PublishTest(ModuleUnitTest):
             TODO: implement test on file size, file content
     """
 
-    APP = ""
+    APP_GROUP = ""
 
     TIMEOUT = 120  # publish timeout
 
@@ -210,10 +223,10 @@ class PublishTest(ModuleUnitTest):
         if not app_variant:
             variant = (
                 application_manager.find_latest_available_variant_for_group(
-                    self.APP))
+                    self.APP_GROUP))
             app_variant = variant.name
 
-        yield "{}/{}".format(self.APP, app_variant)
+        yield "{}/{}".format(self.APP_GROUP, app_variant)
 
     @pytest.fixture(scope="module")
     def output_folder_url(self, download_test_data):
@@ -310,7 +323,8 @@ class PublishTest(ModuleUnitTest):
         yield True
 
     def test_folder_structure_same(self, dbcon, publish_finished,
-                                   download_test_data, output_folder_url):
+                                   download_test_data, output_folder_url,
+                                   skip_compare_folders):
         """Check if expected and published subfolders contain same files.
 
             Compares only presence, not size nor content!
@@ -328,12 +342,33 @@ class PublishTest(ModuleUnitTest):
                        glob.glob(expected_dir_base + "\\**", recursive=True)
                        if f != expected_dir_base and os.path.exists(f))
 
-        not_matched = expected.symmetric_difference(published)
-        assert not not_matched, "Missing {} files".format(
-            "\n".join(sorted(not_matched)))
+        filtered_published = self._filter_files(published,
+                                                skip_compare_folders)
+
+        # filter out temp files also in expected
+        # could be polluted by accident by copying 'output' to zip file
+        filtered_expected = self._filter_files(expected, skip_compare_folders)
+
+        not_mtched = filtered_expected.symmetric_difference(filtered_published)
+        if not_mtched:
+            raise AssertionError("Missing {} files".format(
+                "\n".join(sorted(not_mtched))))
+
+    def _filter_files(self, source_files, skip_compare_folders):
+        """Filter list of files according to regex pattern."""
+        filtered = set()
+        for file_path in source_files:
+            if skip_compare_folders:
+                if not any([re.search(val, file_path)
+                            for val in skip_compare_folders]):
+                    filtered.add(file_path)
+            else:
+                filtered.add(file_path)
+
+        return filtered
 
 
-class HostFixtures(PublishTest):
+class HostFixtures():
     """Host specific fixtures. Should be implemented once per host."""
     @pytest.fixture(scope="module")
     def last_workfile_path(self, download_test_data, output_folder_url):
@@ -344,3 +379,8 @@ class HostFixtures(PublishTest):
     def startup_scripts(self, monkeypatch_session, download_test_data):
         """"Adds init scripts (like userSetup) to expected location"""
         raise NotImplementedError
+
+    @pytest.fixture(scope="module")
+    def skip_compare_folders(self):
+        """Use list of regexs to filter out published folders from comparing"""
+        raise NotImplementedError
diff --git a/tests/resources/test_data.zip b/tests/resources/test_data.zip
index 0faab86b37d5c7d1224e8a92cca766ed80536718..e22b9acdbdbcd7312776e33918ac2a6a9211dab3 100644
GIT binary patch
delta 3519
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
OjAL{M0Puy6dG~*_HIYmJ

literal 7350
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
Wf)o*;6$woS^v@Mq{wxF+-~I#aR+@SM

diff --git a/tests/unit/igniter/test_bootstrap_repos.py b/tests/unit/igniter/test_bootstrap_repos.py
index 10278c4928..8b32bbe03c 100644
--- a/tests/unit/igniter/test_bootstrap_repos.py
+++ b/tests/unit/igniter/test_bootstrap_repos.py
@@ -33,11 +33,11 @@ def test_openpype_version(printer):
     assert str(v2) == "1.2.3-x"
     assert v1 > v2
 
-    v3 = OpenPypeVersion(1, 2, 3, staging=True)
-    assert str(v3) == "1.2.3+staging"
+    v3 = OpenPypeVersion(1, 2, 3)
+    assert str(v3) == "1.2.3"
 
-    v4 = OpenPypeVersion(1, 2, 3, staging="True", prerelease="rc.1")
-    assert str(v4) == "1.2.3-rc.1+staging"
+    v4 = OpenPypeVersion(1, 2, 3, prerelease="rc.1")
+    assert str(v4) == "1.2.3-rc.1"
     assert v3 > v4
     assert v1 > v4
     assert v4 < OpenPypeVersion(1, 2, 3, prerelease="rc.1")
@@ -73,7 +73,7 @@ def test_openpype_version(printer):
         OpenPypeVersion(4, 8, 10),
         OpenPypeVersion(4, 8, 20),
         OpenPypeVersion(4, 8, 9),
-        OpenPypeVersion(1, 2, 3, staging=True),
+        OpenPypeVersion(1, 2, 3),
         OpenPypeVersion(1, 2, 3, build="foo")
     ]
     res = sorted(sort_versions)
@@ -104,27 +104,26 @@ def test_openpype_version(printer):
     with pytest.raises(ValueError):
         _ = OpenPypeVersion(version="booobaa")
 
-    v11 = OpenPypeVersion(version="4.6.7-foo+staging")
+    v11 = OpenPypeVersion(version="4.6.7-foo")
     assert v11.major == 4
     assert v11.minor == 6
     assert v11.patch == 7
-    assert v11.staging is True
     assert v11.prerelease == "foo"
 
 
 def test_get_main_version():
-    ver = OpenPypeVersion(1, 2, 3, staging=True, prerelease="foo")
+    ver = OpenPypeVersion(1, 2, 3, prerelease="foo")
     assert ver.get_main_version() == "1.2.3"
 
 
 def test_get_version_path_from_list():
     versions = [
         OpenPypeVersion(1, 2, 3, path=Path('/foo/bar')),
-        OpenPypeVersion(3, 4, 5, staging=True, path=Path("/bar/baz")),
+        OpenPypeVersion(3, 4, 5, path=Path("/bar/baz")),
         OpenPypeVersion(6, 7, 8, prerelease="x", path=Path("boo/goo"))
     ]
     path = BootstrapRepos.get_version_path_from_list(
-        "3.4.5+staging", versions)
+        "3.4.5", versions)
 
     assert path == Path("/bar/baz")
 
@@ -362,12 +361,15 @@ def test_find_openpype(fix_bootstrap, tmp_path_factory, monkeypatch, printer):
     result = fix_bootstrap.find_openpype(include_zips=True)
     # we should have results as file were created
     assert result is not None, "no OpenPype version found"
-    # latest item in `result` should be latest version found.
+    # latest item in `result` should be the latest version found.
+    # this will be `7.2.10-foo+staging` even with *staging* in since we've
+    # dropped the logic to handle staging separately and in alphabetical
+    # sorting it is after `strange`.
     expected_path = Path(
         d_path / "{}{}{}".format(
-            test_versions_2[3].prefix,
-            test_versions_2[3].version,
-            test_versions_2[3].suffix
+            test_versions_2[4].prefix,
+            test_versions_2[4].version,
+            test_versions_2[4].suffix
         )
     )
     assert result, "nothing found"