Skip to content

Commit 7cb322d

Browse files
YongGooseYongGoose
committed
generate windows test code
Signed-off-by: yongjunhong <[email protected]>
1 parent aeadbbc commit 7cb322d

File tree

7 files changed

+90
-7
lines changed

7 files changed

+90
-7
lines changed

‎tests/pytest/package_manager/test_android.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
# -*- coding: utf-8 -*-
33
# Copyright (c) 2021 LG Electronics Inc.
44
# SPDX-License-Identifier: Apache-2.0
5+
import os.path
56

67
UBUNTU_COMMANDS = [
78
"fosslight_dependency -p tests/test_android -o tests/result/android -m android"
89
]
910

10-
WINDOW_COMMANDS = [
11-
"\dist\cli.exe -p tests\test_maven2 -o tests\result\maven2 -m maven"
12-
]
11+
DIST_PATH = os.path.join(os.path.abspath(os.sep), "dist", "cli.exe")
12+
INPUT_PATH = os.path.join("tests", "test_android", "sunflower")
13+
OUTPUT_PATH = os.path.join("tests", "result", "android")
14+
15+
WINDOW_COMMANDS = [f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH}"]
1316

1417

1518
def test_ubuntu(run_command):
@@ -18,7 +21,7 @@ def test_ubuntu(run_command):
1821
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
1922

2023

21-
def test_window(run_command):
24+
def test_windows(run_command):
2225
for command in WINDOW_COMMANDS:
2326
return_code, stdout, stderr = run_command(command)
2427
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"

‎tests/pytest/package_manager/test_gradle.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,31 @@
22
# -*- coding: utf-8 -*-
33
# Copyright (c) 2021 LG Electronics Inc.
44
# SPDX-License-Identifier: Apache-2.0
5+
import os
56

67
UBUNTU_COMMANDS = [
78
"fosslight_dependency -p tests/test_gradle/jib -o tests/result/gradle",
89
"fosslight_dependency -p tests/test_gradle2 -o tests/result/gradle2"
910
]
1011

12+
DIST_PATH = os.path.join(os.path.abspath(os.sep), "dist", "cli.exe")
13+
INPUT_PATH = os.path.join("tests", "test_gradle", "jib")
14+
OUTPUT_PATH = os.path.join("tests", "result", "gradle")
15+
INPUT_PATH2 = os.path.join("tests", "test_gradle2")
16+
OUTPUT_PATH2 = os.path.join("tests", "result", "gradle2")
17+
18+
WINDOW_COMMANDS = [
19+
f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH} -m gradle",
20+
f"{DIST_PATH} -p {INPUT_PATH2} -o {OUTPUT_PATH2} -m gradle",
21+
]
1122

1223
def test_ubuntu(run_command):
1324
for command in UBUNTU_COMMANDS:
1425
return_code, stdout, stderr = run_command(command)
1526
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
27+
28+
29+
def test_windows(run_command):
30+
for command in WINDOW_COMMANDS:
31+
return_code, stdout, stderr = run_command(command)
32+
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"

‎tests/pytest/package_manager/test_maven.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,27 @@
22
# -*- coding: utf-8 -*-
33
# Copyright (c) 2021 LG Electronics Inc.
44
# SPDX-License-Identifier: Apache-2.0
5+
import os.path
56

67
UBUNTU_COMMANDS = [
78
"fosslight_dependency -p tests/test_maven1/lombok.maven -o tests/result/maven1",
89
"fosslight_dependency -p tests/test_maven2 -o tests/result/maven2"
910
]
1011

12+
DIST_PATH = os.path.join(os.path.abspath(os.sep), "dist", "cli.exe")
13+
INPUT_PATH = os.path.join("tests", "test_maven2")
14+
OUTPUT_PATH = os.path.join("tests", "result", "maven2")
15+
16+
WINDOW_COMMANDS = [f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH} -m maven"]
17+
1118

1219
def test_ubuntu(run_command):
1320
for command in UBUNTU_COMMANDS:
1421
return_code, stdout, stderr = run_command(command)
1522
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
23+
24+
25+
def test_windows(run_command):
26+
for command in WINDOW_COMMANDS:
27+
return_code, stdout, stderr = run_command(command)
28+
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"

‎tests/pytest/package_manager/test_nuget.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,32 @@
22
# -*- coding: utf-8 -*-
33
# Copyright (c) 2021 LG Electronics Inc.
44
# SPDX-License-Identifier: Apache-2.0
5+
import os.path
56

67
UBUNTU_COMMANDS = [
78
"fosslight_dependency -p tests/test_nuget -o tests/result/nuget1",
89
"fosslight_dependency -p tests/test_nuget2 -o tests/result/nuget2"
910
]
1011

12+
DIST_PATH = os.path.join(os.path.abspath(os.sep), "dist", "cli.exe")
13+
INPUT_PATH = os.path.join("tests", "test_nuget")
14+
OUTPUT_PATH = os.path.join("tests", "result", "nuget1")
15+
INPUT_PATH2 = os.path.join("tests", "test_nuget2")
16+
OUTPUT_PATH2 = os.path.join("tests", "result", "nuget2")
17+
18+
WINDOW_COMMANDS = [
19+
f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH}",
20+
f"{DIST_PATH} -p {INPUT_PATH2} -o {OUTPUT_PATH2}"
21+
]
22+
1123

1224
def test_ubuntu(run_command):
1325
for command in UBUNTU_COMMANDS:
1426
return_code, stdout, stderr = run_command(command)
1527
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
28+
29+
30+
def test_windows(run_command):
31+
for command in WINDOW_COMMANDS:
32+
return_code, stdout, stderr = run_command(command)
33+
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"

‎tests/pytest/package_manager/test_pub.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,33 @@
22
# -*- coding: utf-8 -*-
33
# Copyright (c) 2021 LG Electronics Inc.
44
# SPDX-License-Identifier: Apache-2.0
5+
import os.path
56

67
UBUNTU_COMMANDS = [
78
"fosslight_dependency -p tests/test_pub -o tests/result/pub",
89
"fosslight_dependency -p tests/test_exclude -e requirements.txt -o tests/result/exclude"
910
]
1011

12+
DIST_PATH = os.path.join(os.path.abspath(os.sep), "dist", "cli.exe")
13+
INPUT_PATH = os.path.join("tests", "test_pub")
14+
OUTPUT_PATH = os.path.join("tests", "result", "pub")
15+
INPUT_PATH2 = os.path.join("tests", "test_exclude")
16+
OUTPUT_PATH2 = os.path.join("tests", "result", "exclude")
17+
18+
WINDOW_COMMANDS = [
19+
f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH}",
20+
f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH} -f opossum",
21+
f"{DIST_PATH} -p {INPUT_PATH} -e requirements.txt -o {OUTPUT_PATH}"
22+
]
23+
1124

1225
def test_ubuntu(run_command):
1326
for command in UBUNTU_COMMANDS:
1427
return_code, stdout, stderr = run_command(command)
1528
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
29+
30+
31+
def test_windows(run_command):
32+
for command in WINDOW_COMMANDS:
33+
return_code, stdout, stderr = run_command(command)
34+
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"

‎tests/pytest/package_manager/test_pypi.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,28 @@
22
# -*- coding: utf-8 -*-
33
# Copyright (c) 2021 LG Electronics Inc.
44
# SPDX-License-Identifier: Apache-2.0
5+
import os.path
56

67
UBUNTU_COMMANDS = [
78
"fosslight_dependency -p tests/test_pypi -o tests/result/pypi",
89
"fosslight_dependency -p tests/test_multi_pypi_npm -o tests/result/multi_pypi_npm",
910
"fosslight_dependency -p tests/test_multi_pypi_npm -o tests/result/multi_pypi_npm -f opossum"
1011
]
1112

13+
DIST_PATH = os.path.join(os.path.abspath(os.sep), "dist", "cli.exe")
14+
INPUT_PATH = os.path.join("tests", "test_pypi")
15+
OUTPUT_PATH = os.path.join("tests", "result", "pypi")
16+
17+
WINDOW_COMMANDS = [f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH}"]
18+
1219

1320
def test_ubuntu(run_command):
1421
for command in UBUNTU_COMMANDS:
1522
return_code, stdout, stderr = run_command(command)
1623
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
24+
25+
26+
def test_windows(run_command):
27+
for command in WINDOW_COMMANDS:
28+
return_code, stdout, stderr = run_command(command)
29+
assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"

‎tox.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ commands =
4242

4343
[testenv:run_windows]
4444
deps =
45-
-r{toxinidir}\requirements-dev.txt
45+
-r{toxinidir}/requirements-dev.txt
4646
commands =
4747
# Test for making excutable file
48-
pyinstaller --onefile cli.py -n cli --additional-hooks-dir=hooks --add-binary=src\fosslight_dependency\third_party\askalono\askalono.exe:third_party\askalono --add-binary=LICENSE:LICENSES --add-binary=LICENSES\LicenseRef-3rd_party_licenses.txt:LICENSES --collect-datas fosslight_util --hidden-import=_cffi_backend
49-
pytest tests\ -k "test_windows"
48+
pyinstaller --onefile cli.py -n cli --additional-hooks-dir=hooks --add-binary=src/fosslight_dependency/third_party/askalono/askalono.exe:third_party/askalono --add-binary=LICENSE:LICENSES --add-binary=LICENSES/LicenseRef-3rd_party_licenses.txt:LICENSES --collect-datas fosslight_util --hidden-import=_cffi_backend
49+
pytest tests/ -k "test_windows"

0 commit comments

Comments
 (0)