Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update version of setup-python action #1237

Merged
merged 3 commits into from
May 24, 2024
Merged

update version of setup-python action #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36b9814
Update packaging.yml
lukewrites May 23, 2024
43d2ace
Update tdvt.yml
lukewrites May 23, 2024
ead1935
Update tdvt_test.py
lukewrites May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tdvt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 9 additions & 6 deletions tdvt/test/tdvt_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
Loading