update version of setup-python action (#1237)

* Update packaging.yml * Update tdvt.yml uses: actions/[email protected] * Update tdvt_test.py fix tests to pass on Mac arm
tableau · May 24, 2024 · ee1d09a · ee1d09a
1 parent a73623c
commit ee1d09a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git 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

diff --git 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

diff --git 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)