Utilize Automatic Package Discovery

Co-authored-by: mason.davis <[email protected]>
AdnaneKhan · Jan 27, 2023 · ecf3313 · ecf3313
1 parent 0545e59
commit ecf3313
Show file tree

Hide file tree

Showing 28 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -35,7 +35,7 @@ jobs:
               python-version: 3.11
           - run: pip install requests
           - name: Dispatch Runner Event
-            run: python integration/runner_helper.py dispatch
+            run: python test/runner_helper.py dispatch
     Integration-Testing:
         name: Gato Integration Testing
         needs: SH-Runner-Dispatch
@@ -61,4 +61,4 @@ jobs:
               pip install ".[test]"
           - name: Kick off integration tests.
             run: |
-              pytest integration/
+              pytest test/
diff --git a/.github/workflows/integration_sh.yaml b/.github/workflows/integration_sh.yaml
@@ -6,7 +6,7 @@ env:
     SH_RUNNER_MANAGE_TOKEN: ${{secrets.SH_RUNNER_MANAGE_TOKEN }}
 
 jobs:
-    # This job creates a self-hosted runner attached to the 
+    # This job creates a self-hosted runner attached to the
     # test organization.
     Integration_SH_Runner:
         name: Ephemeral Self-Hosted Runner
@@ -25,14 +25,14 @@ jobs:
               mkdir actions-runner && cd actions-runner
               curl -o actions-runner-linux-x64-2.300.2.tar.gz -L https://github.com/actions/runner/releases/download/v2.300.2/actions-runner-linux-x64-2.300.2.tar.gz
               tar xzf ./actions-runner-linux-x64-2.300.2.tar.gz
-              python ../integration/runner_helper.py register
+              python ../test/runner_helper.py register
               nohup ./run.sh &
           - name: Sleep
             run: python3 -c "import time; time.sleep(840)"
           - name: Remove Runner
             run: |
               cd actions-runner
-              python ../integration/runner_helper.py remove
+              python ../test/runner_helper.py remove
     SH_Runner_Cleanup:
     # Removes the self-hosted runner forcibly in the event the cleanup operation
     # did not work.
@@ -50,4 +50,4 @@ jobs:
           - name: Force Remove SH Runner
             run: |
               pip install requests
-              python integration/runner_helper.py force_remove
+              python test/runner_helper.py force_remove
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,13 +34,8 @@ test = [
     "pytest-cov"
 ]
 
-[tool.setuptools]
-py-modules = [
-    "gato"
-]
-
 [tool.pytest.ini_options]
-testpaths = ["test"]
+testpaths = ["unit_test"]
 python_files = ["test_*.py"]
 addopts = "--cov=gato"
 

diff --git a/integration/creds.json → test/creds.json b/integration/creds.json → test/creds.json
diff --git a/integration/integration_utils.py → test/integration_utils.py b/integration/integration_utils.py → test/integration_utils.py
diff --git a/integration/runner_helper.py → test/runner_helper.py b/integration/runner_helper.py → test/runner_helper.py
diff --git a/integration/test_cases.json → test/test_cases.json b/integration/test_cases.json → test/test_cases.json
diff --git a/integration/test_enumeration.py → test/test_enumeration.py b/integration/test_enumeration.py → test/test_enumeration.py
diff --git a/integration/test_help.py → test/test_help.py b/integration/test_help.py → test/test_help.py
diff --git a/integration/__init__.py → unit_test/__init__.py b/integration/__init__.py → unit_test/__init__.py
diff --git a/test/files/bad_dir/bad_file → unit_test/files/bad_dir/bad_file b/test/files/bad_dir/bad_file → unit_test/files/bad_dir/bad_file
diff --git a/test/files/example_repo.json → unit_test/files/example_repo.json b/test/files/example_repo.json → unit_test/files/example_repo.json
diff --git a/test/files/main.yaml → unit_test/files/main.yaml b/test/files/main.yaml → unit_test/files/main.yaml
diff --git a/test/files/readme.md → unit_test/files/readme.md b/test/files/readme.md → unit_test/files/readme.md
diff --git a/test/files/run_log.zip → unit_test/files/run_log.zip b/test/files/run_log.zip → unit_test/files/run_log.zip
diff --git a/test/files/test_repos_bad.txt → unit_test/files/test_repos_bad.txt b/test/files/test_repos_bad.txt → unit_test/files/test_repos_bad.txt
diff --git a/test/files/test_repos_good.txt → unit_test/files/test_repos_good.txt b/test/files/test_repos_good.txt → unit_test/files/test_repos_good.txt
diff --git a/.../workflow_test/.github/workflows/test.yml → .../workflow_test/.github/workflows/test.yml b/.../workflow_test/.github/workflows/test.yml → .../workflow_test/.github/workflows/test.yml
diff --git a/test/files/workflow_test/README.md → unit_test/files/workflow_test/README.md b/test/files/workflow_test/README.md → unit_test/files/workflow_test/README.md
diff --git a/test/test_api.py → unit_test/test_api.py b/test/test_api.py → unit_test/test_api.py
diff --git a/test/test_attack.py → unit_test/test_attack.py b/test/test_attack.py → unit_test/test_attack.py
diff --git a/test/test_cicd_attack.py → unit_test/test_cicd_attack.py b/test/test_cicd_attack.py → unit_test/test_cicd_attack.py
diff --git a/test/test_cli.py → unit_test/test_cli.py b/test/test_cli.py → unit_test/test_cli.py
@@ -91,10 +91,11 @@ def test_attack_bad_args1(capfd):
 def test_attack_bad_args2(capfd):
     """Test attack command with conflicting params.
     """
+    curr_path = pathlib.Path(__file__).parent.resolve()
 
     with pytest.raises(SystemExit):
         cli.cli(["attack", "-t", "test", "-pr",
-                 "-f", "test/files/main.yaml", "-n", "invalid"])
+                 "-f", os.path.join(curr_path, "files/main.yaml"), "-n", "invalid"])
 
     out, err = capfd.readouterr()
     assert "cannot be used with a custom" in err

diff --git a/test/test_enumerate.py → unit_test/test_enumerate.py b/test/test_enumerate.py → unit_test/test_enumerate.py
diff --git a/test/test_git.py → unit_test/test_git.py b/test/test_git.py → unit_test/test_git.py
diff --git a/test/test_main.py → unit_test/test_main.py b/test/test_main.py → unit_test/test_main.py
diff --git a/test/test_search.py → unit_test/test_search.py b/test/test_search.py → unit_test/test_search.py
diff --git a/test/test_workflow_parser.py → unit_test/test_workflow_parser.py b/test/test_workflow_parser.py → unit_test/test_workflow_parser.py