Skip to content

Commit f6d0094

Browse files
committed
skip changelog] CI test definitive edition
1 parent d39d46d commit f6d0094

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

Diff for: .github/workflows/test.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,6 @@ jobs:
7171
if: matrix.operating-system == 'ubuntu-latest'
7272
run: task test-legacy
7373

74-
- name: Test archive
75-
if: matrix.operating-system == 'windows-latest'
76-
run: |
77-
cd "D:\a\arduino-cli\arduino-cli\client_example\hello" && "D:\a\arduino-cli\arduino-cli\arduino-cli.exe" archive
78-
cd .. && dir
79-
8074
- name: Run integration tests
8175
run: task test-integration
8276

Diff for: test/conftest.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ def _run(cmd_string, custom_working_dir=None):
102102
# Context.cd() is not used since it doesn't work correctly on Windows.
103103
# It escapes spaces in the path using "\ " but it doesn't always work,
104104
# wrapping the path in quotation marks is the safest approach
105-
with run_context.prefix(f'cd "{custom_working_dir}"'):
105+
flag = ""
106+
if platform.system() == "Windows":
107+
flag = "/d"
108+
with run_context.prefix(f'cd {flag} "{custom_working_dir}"'):
106109
return run_context.run(cli_full_line, echo=False, hide=True, warn=True, env=env)
107110

108111
return _run
@@ -130,7 +133,10 @@ def daemon_runner(pytestconfig, data_dir, downloads_dir, working_dir):
130133
# Context.cd() is not used since it doesn't work correctly on Windows.
131134
# It escapes spaces in the path using "\ " but it doesn't always work,
132135
# wrapping the path in quotation marks is the safest approach
133-
run_context.prefix(f'cd "{working_dir}"')
136+
flag = ""
137+
if platform.system() == "Windows":
138+
flag = "/d"
139+
run_context.prefix(f'cd {flag} "{working_dir}"')
134140
# Local Class is the implementation of a Runner abstract class
135141
runner = Local(run_context)
136142
runner.run(cli_full_line, echo=False, hide=True, warn=True, env=env, asynchronous=True)

Diff for: test/test_archive.py

-8
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def _run(cmd_string, custom_working_dir):
5656
return _run
5757

5858

59-
@pytest.mark.skip()
6059
def test_archive_no_args(run_simple, run_command, copy_sketch, working_dir):
6160
# result = run_simple("dir", copy_sketch)
6261
# print(result.stdout)
@@ -86,7 +85,6 @@ def test_archive_no_args(run_simple, run_command, copy_sketch, working_dir):
8685
archive.close()
8786

8887

89-
@pytest.mark.skip()
9088
def test_archive_dot_arg(run_command, copy_sketch, working_dir):
9189
result = run_command("archive .", copy_sketch)
9290
assert result.ok
@@ -111,7 +109,6 @@ def test_archive_dot_arg(run_command, copy_sketch, working_dir):
111109
archive.close()
112110

113111

114-
@pytest.mark.skip()
115112
def test_archive_dot_arg_relative_zip_path(run_command, copy_sketch, working_dir):
116113
# Creates a folder where to save the zip
117114
archives_folder = f"{working_dir}/my_archives/"
@@ -140,7 +137,6 @@ def test_archive_dot_arg_relative_zip_path(run_command, copy_sketch, working_dir
140137
archive.close()
141138

142139

143-
@pytest.mark.skip()
144140
def test_archive_dot_arg_absolute_zip_path(run_command, copy_sketch, working_dir):
145141
# Creates a folder where to save the zip
146142
archives_folder = f"{working_dir}/my_archives/"
@@ -170,7 +166,6 @@ def test_archive_dot_arg_absolute_zip_path(run_command, copy_sketch, working_dir
170166
archive.close()
171167

172168

173-
@pytest.mark.skip()
174169
def test_archive_dot_arg_relative_zip_path_and_name_without_extension(run_command, copy_sketch, working_dir):
175170
# Creates a folder where to save the zip
176171
archives_folder = f"{working_dir}/my_archives/"
@@ -199,7 +194,6 @@ def test_archive_dot_arg_relative_zip_path_and_name_without_extension(run_comman
199194
archive.close()
200195

201196

202-
@pytest.mark.skip()
203197
def test_archive_dot_arg_absolute_zip_path_and_name_without_extension(run_command, copy_sketch, working_dir):
204198
# Creates a folder where to save the zip
205199
archives_folder = f"{working_dir}/my_archives/"
@@ -228,7 +222,6 @@ def test_archive_dot_arg_absolute_zip_path_and_name_without_extension(run_comman
228222
archive.close()
229223

230224

231-
@pytest.mark.skip()
232225
def test_archive_dot_arg_custom_zip_path_and_name_with_extension(run_command, copy_sketch, working_dir):
233226
# Creates a folder where to save the zip
234227
archives_folder = f"{working_dir}/my_archives/"
@@ -257,7 +250,6 @@ def test_archive_dot_arg_custom_zip_path_and_name_with_extension(run_command, co
257250
archive.close()
258251

259252

260-
@pytest.mark.skip()
261253
def test_archive_relative_sketch_path(run_command, copy_sketch, working_dir):
262254
result = run_command("archive ./sketch_simple")
263255
assert result.ok

0 commit comments

Comments
 (0)