merge from development

Signed-off-by: sweeneys <sweeneys@amazon.com>
2021-11-12 14:47:08 -08:00
parent 10619d53bf 57adfd795e
commit 3ae8f8b199
1676 changed files with 212117 additions and 6819 deletions
@@ -119,7 +119,7 @@ class TestEditorTestUtils(unittest.TestCase):
        mock_log = 'mock log info'

        with mock.patch('builtins.open', mock.mock_open(read_data=mock_log)) as mock_file:
-            assert f'[editor.log]  {mock_log}' == editor_test_utils.retrieve_editor_log_content(0, mock_logname, mock_workspace)
+            assert f'[{mock_logname}]  {mock_log}' == editor_test_utils.retrieve_editor_log_content(0, mock_logname, mock_workspace)

    @mock.patch('ly_test_tools.o3de.editor_test_utils.retrieve_log_path')
    @mock.patch('ly_test_tools.environment.waiter.wait_for', mock.MagicMock())
@@ -127,7 +127,7 @@ class TestEditorTestUtils(unittest.TestCase):
        mock_retrieve_log_path.return_value = 'mock_log_path'
        mock_logname = 'mock_log.log'
        mock_workspace = mock.MagicMock()
-        expected = f"-- Error reading editor.log"
+        expected = f"-- Error reading {mock_logname}"

        assert expected in editor_test_utils.retrieve_editor_log_content(0, mock_logname, mock_workspace)