Merging development into editor_test_tools_cleanup

Signed-off-by: evanchia <evanchia@amazon.com>
2021-10-13 12:50:17 -07:00
parent 8ab9f89b46 da3a39a6a0
commit a53e0e8124
1733 changed files with 154621 additions and 22912 deletions
@@ -265,7 +265,7 @@ class AbstractResourceLocator(object):
        Return path to AssetProcessor's log file using the project bin dir
        :return: path to 'AP_Gui.log' file in <ap_log_dir> folder
        """
-        return os.path.join(self.ap_log_dir(), 'AP_Gui.log')
+        return os.path.join(self.ap_log_dir(), 'AP_GUI.log')

    def project_cache(self):
        """
@@ -23,9 +23,6 @@ class _LinuxResourceManager(AbstractResourceLocator):
    """
    Override for locating resources in a Linux operating system running LyTestTools.
    """
-    def __init__(self, build_directory: str, project: str):
-        pass
-
    def platform_config_file(self):
        """
        :return: path to the platform config file