refactor test codes

YongGoose · YongGoose · commit aeadbbc964c8 · 2024-09-26T13:00:38.000+09:00
- rename test methods
- separate window, ubuntu test codes

Signed-off-by: yongjunhong &lt;kevin0928@naver.com&gt;
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,5 @@
 flake8==3.9.2
-pyinstaller
+pyinstaller>=6.10.0
 tox>=4.18.1
 pytest
 pytest-cov
diff --git a/tests/pytest/package_manager/test_android.py b/tests/pytest/package_manager/test_android.py
@@ -3,12 +3,22 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_android -o tests/result/android -m android"
 ]
 
+WINDOW_COMMANDS = [
+    "\dist\cli.exe -p tests\test_maven2 -o tests\result\maven2 -m maven"
+]
+
+
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
+        return_code, stdout, stderr = run_command(command)
+        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+
 
-def test_android_get_dependency(run_command):
-    for command in COMMANDS:
+def test_window(run_command):
+    for command in WINDOW_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_carthage.py b/tests/pytest/package_manager/test_carthage.py
@@ -3,12 +3,12 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_carthage -o tests/result/carthage -m carthage"
 ]
 
 
-def test_carthage_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_cocoapods.py b/tests/pytest/package_manager/test_cocoapods.py
@@ -3,12 +3,12 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_cocoapods -o tests/result/cocoapods -m cocoapods"
 ]
 
 
-def test_cocoapods_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_gradle.py b/tests/pytest/package_manager/test_gradle.py
@@ -3,13 +3,13 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_gradle/jib -o tests/result/gradle",
     "fosslight_dependency -p tests/test_gradle2 -o tests/result/gradle2"
 ]
 
 
-def test_gradle_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_helm.py b/tests/pytest/package_manager/test_helm.py
@@ -3,12 +3,12 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_helm -o tests/result/helm -m helm"
 ]
 
 
-def test_helm_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_maven.py b/tests/pytest/package_manager/test_maven.py
@@ -3,13 +3,13 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_maven1/lombok.maven -o tests/result/maven1",
     "fosslight_dependency -p tests/test_maven2 -o tests/result/maven2"
 ]
 
 
-def test_maven_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_npm.py b/tests/pytest/package_manager/test_npm.py
@@ -3,13 +3,13 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_npm1 -o tests/result/npm1",
     "fosslight_dependency -p tests/test_npm2 -o tests/result/npm2 -m npm"
 ]
 
 
-def test_npm_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_nuget.py b/tests/pytest/package_manager/test_nuget.py
@@ -3,13 +3,13 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_nuget -o tests/result/nuget1",
     "fosslight_dependency -p tests/test_nuget2 -o tests/result/nuget2"
 ]
 
 
-def test_nuget_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_pub.py b/tests/pytest/package_manager/test_pub.py
@@ -3,13 +3,13 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_pub -o tests/result/pub",
     "fosslight_dependency -p tests/test_exclude -e requirements.txt -o tests/result/exclude"
 ]
 
 
-def test_pub_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tests/pytest/package_manager/test_pypi.py b/tests/pytest/package_manager/test_pypi.py
@@ -3,14 +3,14 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-COMMANDS = [
+UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_pypi -o tests/result/pypi",
     "fosslight_dependency -p tests/test_multi_pypi_npm -o tests/result/multi_pypi_npm",
     "fosslight_dependency -p tests/test_multi_pypi_npm -o tests/result/multi_pypi_npm -f opossum"
 ]
 
 
-def test_pypi_get_dependency(run_command):
-    for command in COMMANDS:
+def test_ubuntu(run_command):
+    for command in UBUNTU_COMMANDS:
         return_code, stdout, stderr = run_command(command)
         assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
diff --git a/tox.ini b/tox.ini
@@ -38,32 +38,12 @@ deps =
 commands =
   # Test for PEP8
   pytest -v --flake8
-  pytest -n auto
-
+  pytest tests/ -k "test_ubuntu"
 
 [testenv:run_windows]
 deps =
   -r{toxinidir}\requirements-dev.txt
 commands =
   # Test for making excutable file
-  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
-  # Test for Pypi
-  {toxinidir}\dist\cli.exe -p tests\test_pypi -o tests\result\pypi
-  # Test for Maven (with optional command)
-  {toxinidir}\dist\cli.exe -p tests\test_maven2 -o tests\result\maven2 -m maven
-  # Test for Gradle
-  {toxinidir}\dist\cli.exe -p tests\test_gradle\jib -o tests\result\gradle -m gradle
-  # Test for Gradle2
-  fosslight_dependency -p tests\test_gradle2 -o tests\result\gradle2 -m gradle
-  # Test for Pub
-  {toxinidir}\dist\cli.exe -p tests\test_pub -o tests\result\pub
-  # Test for Android
-  {toxinidir}\dist\cli.exe -p tests\test_android\sunflower -o tests\result\android
-  # Test for opossum result
-  {toxinidir}\dist\cli.exe -p tests\test_pub -o tests\result\pub -f opossum
-  # Test for nuget (for packageReference)
-  {toxinidir}\dist\cli.exe -p tests\test_nuget -o tests\result\nuget1
-  # Test for nuget2 (for packages.config)
-  {toxinidir}\dist\cli.exe -p tests\test_nuget2 -o tests\result\nuget2
-  # Test for excluding path (scan only pub, exclude pypi)
-  {toxinidir}\dist\cli.exe -p tests\test_exclude -e requirements.txt -o tests\result\exclude
+  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
+  pytest tests\ -k "test_windows"
