From 36b9814e3bb0d5578b023d6457e59d4051d9d27f Mon Sep 17 00:00:00 2001 From: Luke Petschauer Date: Thu, 23 May 2024 15:59:34 -0700 Subject: [PATCH 1/3] Update packaging.yml --- .github/workflows/packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 13f9632c..e12eedf1 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python 3.9 - uses: actions/setup-python@v1 + uses: actions/setup-python@v5.1.0 with: python-version: 3.9 - name: Set up Java From 43d2ace7c11ead20a9466e50757fb2e92cfdb22b Mon Sep 17 00:00:00 2001 From: Luke Petschauer Date: Thu, 23 May 2024 16:00:37 -0700 Subject: [PATCH 2/3] Update tdvt.yml uses: actions/setup-python@v5.1.0 --- .github/workflows/tdvt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tdvt.yml b/.github/workflows/tdvt.yml index ecefb091..f7a9e835 100644 --- a/.github/workflows/tdvt.yml +++ b/.github/workflows/tdvt.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python 3.9 - uses: actions/setup-python@v1 + uses: actions/setup-python@v5.1.0 with: python-version: 3.9 - name: Install TDVT From ead1935c9544ca097cbfb6e49a7de903d6919dc5 Mon Sep 17 00:00:00 2001 From: Luke Petschauer Date: Thu, 23 May 2024 16:37:34 -0700 Subject: [PATCH 3/3] Update tdvt_test.py fix tests to pass on Mac arm --- tdvt/test/tdvt_test.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tdvt/test/tdvt_test.py b/tdvt/test/tdvt_test.py index f4f82285..49ba0b9e 100644 --- a/tdvt/test/tdvt_test.py +++ b/tdvt/test/tdvt_test.py @@ -331,7 +331,10 @@ def test_command_line_override_full(self): if sys.platform in ('win32', 'cygwin'): expected = win_path elif sys.platform == 'darwin': - expected = mac_path + if platform.machine() == 'arm64': + expected = mac_arm_path + else: + expected = mac_path elif sys.platform == 'linux': expected = linux_path else: @@ -341,7 +344,7 @@ def test_command_line_override_full(self): def test_command_line_full(self): self.test_config.output_dir = 'my/output/dir' self.test_config.d_override = '-DLogLevel=Debug' - self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerycli", "tabquerytool.exe") + self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerytool", "tabquerytool.exe") work = tdvt_core.BatchQueueWork(self.test_config, self.test_set) cmd_line = build_tabquery_command_line_local(work) @@ -356,7 +359,7 @@ def test_command_line_full(self): def test_password_file(self): self.test_config.output_dir = 'my/output/dir' - self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerycli", "tabquerytool.exe") + self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerytool", "tabquerytool.exe") suite = 'password_test' self.test_set = ExpressionTestSet('', TEST_DIRECTORY, 'mytest', self.test_config.tds, '', self.test_file, suite) @@ -366,7 +369,7 @@ def test_password_file(self): self.assertTrue('--password-file' in cmd_line_str and 'password_test.password' in cmd_line_str) def test_command_line_no_expected(self): - self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerycli", "tabquerytool.exe") + self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerytool", "tabquerytool.exe") work = tdvt_core.BatchQueueWork(self.test_config, self.test_set) cmd_line = build_tabquery_command_line_local(work) cmd_line_str = ' '.join(cmd_line) @@ -380,7 +383,7 @@ def test_command_line_no_expected(self): def test_command_line_multiple_override(self): self.test_config.d_override = '-DLogLevel=Debug -DUseJDBC -DOverride=MongoDBConnector:on,SomethingElse:off' - self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerycli", "tabquerytool.exe") + self.test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerytool", "tabquerytool.exe") work = tdvt_core.BatchQueueWork(self.test_config, self.test_set) cmd_line = build_tabquery_command_line_local(work) @@ -403,7 +406,7 @@ def test_command_line_multiple_override_from_invocation(self): test_file = 'some/test/file.txt' test_set = ExpressionTestSet('', TEST_DIRECTORY, 'mytest', test_config.tds, '', self.test_file, '') - test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerycli", "tabquerytool.exe") + test_config.tested_run_time_config.set_tabquery_paths("tabquerytool", "tabquerytool", "tabquerytool", "tabquerytool.exe") work = tdvt_core.BatchQueueWork(test_config, self.test_set) cmd_line = build_tabquery_command_line_local(work)