Inline tests and distribute with package (#552)

* Move tests inline * Add test responses to package * Fix CI --------- Co-authored-by: rikroe <rikroe@users.noreply.github.com>
bimmerconnected · Aug 5, 2023 · 95cd1de · 95cd1de
1 parent e5d6e18
commit 95cd1de
Show file tree

Hide file tree

Showing 53 changed files with 10 additions and 7 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -3,6 +3,7 @@ relative_files = True
 omit = 
     bimmer_connected/cli.py
     bimmer_connected/coord_convert.py
+    bimmer_connected/tests/*
 
 [report]
 exclude_lines =

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
           pip install -e .
       - name: Test with pytest
         run: |
-          pytest --cov=bimmer_connected --timeout=10 --cov-report=xml test
+          pytest --cov bimmer_connected --timeout 10 --cov-report xml --pyargs bimmer_connected
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
@@ -53,7 +53,7 @@ jobs:
           pip install -r requirements.txt -r requirements-test.txt
       - name: Test with flake8
         run: |
-          ruff --config=pyproject.toml bimmer_connected test
+          ruff --config=pyproject.toml bimmer_connected
 
   black:
     runs-on: ubuntu-latest
@@ -70,7 +70,7 @@ jobs:
           pip install -r requirements.txt -r requirements-test.txt
       - name: Test with black
         run: |
-          black --check bimmer_connected test
+          black --check bimmer_connected
   
   mypy:
     runs-on: ubuntu-latest
@@ -87,7 +87,7 @@ jobs:
           pip install -r requirements.txt -r requirements-test.txt
       - name: Test with mypy
         run: |
-          mypy bimmer_connected test
+          mypy bimmer_connected
 
   docs:
     runs-on: ubuntu-latest

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
         args:
           - --safe
           - --quiet
-        files: ^((bimmer_connected|test)/.+)?[^/]+\.py$
+        files: ^(bimmer_connected/.+)?[^/]+\.py$
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.5
     hooks:
@@ -30,5 +30,5 @@ repos:
         name: mypy
         entry: mypy
         additional_dependencies: [types-setuptools, "typing_extensions>=3.10.0.2,<5.0"]
-        files: ^(bimmer_connected|test)/.+\.py$
+        files: ^bimmer_connected/.+\.py$
 
diff --git a/test/__init__.py → bimmer_connected/tests/__init__.py b/test/__init__.py → bimmer_connected/tests/__init__.py
diff --git a/test/common.py → bimmer_connected/tests/common.py b/test/common.py → bimmer_connected/tests/common.py
diff --git a/test/conftest.py → bimmer_connected/tests/conftest.py b/test/conftest.py → bimmer_connected/tests/conftest.py
diff --git a/...onses/F31/bmw-eadrax-vcs_v4_vehicles.json → ...onses/F31/bmw-eadrax-vcs_v4_vehicles.json b/...onses/F31/bmw-eadrax-vcs_v4_vehicles.json → ...onses/F31/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBA00000000000F31.json → ..._v4_vehicles_state_WBA00000000000F31.json b/..._v4_vehicles_state_WBA00000000000F31.json → ..._v4_vehicles_state_WBA00000000000F31.json
diff --git a/...-crccs_v2_vehicles_WBA00000000DEMO04.json → ...-crccs_v2_vehicles_WBA00000000DEMO04.json b/...-crccs_v2_vehicles_WBA00000000DEMO04.json → ...-crccs_v2_vehicles_WBA00000000DEMO04.json
diff --git a/...onses/G01/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G01/bmw-eadrax-vcs_v4_vehicles.json b/...onses/G01/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G01/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBA00000000DEMO04.json → ..._v4_vehicles_state_WBA00000000DEMO04.json b/..._v4_vehicles_state_WBA00000000DEMO04.json → ..._v4_vehicles_state_WBA00000000DEMO04.json
diff --git a/...onses/G20/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G20/bmw-eadrax-vcs_v4_vehicles.json b/...onses/G20/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G20/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBA00000000DEMO03.json → ..._v4_vehicles_state_WBA00000000DEMO03.json b/..._v4_vehicles_state_WBA00000000DEMO03.json → ..._v4_vehicles_state_WBA00000000DEMO03.json
diff --git a/...-crccs_v2_vehicles_WBA00000000DEMO02.json → ...-crccs_v2_vehicles_WBA00000000DEMO02.json b/...-crccs_v2_vehicles_WBA00000000DEMO02.json → ...-crccs_v2_vehicles_WBA00000000DEMO02.json
diff --git a/...onses/G26/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G26/bmw-eadrax-vcs_v4_vehicles.json b/...onses/G26/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G26/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBA00000000DEMO02.json → ..._v4_vehicles_state_WBA00000000DEMO02.json b/..._v4_vehicles_state_WBA00000000DEMO02.json → ..._v4_vehicles_state_WBA00000000DEMO02.json
diff --git a/...-crccs_v2_vehicles_WBA00000000DEMO05.json → ...-crccs_v2_vehicles_WBA00000000DEMO05.json b/...-crccs_v2_vehicles_WBA00000000DEMO05.json → ...-crccs_v2_vehicles_WBA00000000DEMO05.json
diff --git a/...onses/G70/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G70/bmw-eadrax-vcs_v4_vehicles.json b/...onses/G70/bmw-eadrax-vcs_v4_vehicles.json → ...onses/G70/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBA00000000DEMO05.json → ..._v4_vehicles_state_WBA00000000DEMO05.json b/..._v4_vehicles_state_WBA00000000DEMO05.json → ..._v4_vehicles_state_WBA00000000DEMO05.json
diff --git a/...-crccs_v2_vehicles_WBY000000NOREXI01.json → ...-crccs_v2_vehicles_WBY000000NOREXI01.json b/...-crccs_v2_vehicles_WBY000000NOREXI01.json → ...-crccs_v2_vehicles_WBY000000NOREXI01.json
diff --git a/...I01_NOREX/bmw-eadrax-vcs_v4_vehicles.json → ...I01_NOREX/bmw-eadrax-vcs_v4_vehicles.json b/...I01_NOREX/bmw-eadrax-vcs_v4_vehicles.json → ...I01_NOREX/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBY000000NOREXI01.json → ..._v4_vehicles_state_WBY000000NOREXI01.json b/..._v4_vehicles_state_WBY000000NOREXI01.json → ..._v4_vehicles_state_WBY000000NOREXI01.json
diff --git a/...-crccs_v2_vehicles_WBY00000000REXI01.json → ...-crccs_v2_vehicles_WBY00000000REXI01.json b/...-crccs_v2_vehicles_WBY00000000REXI01.json → ...-crccs_v2_vehicles_WBY00000000REXI01.json
diff --git a/...s/I01_REX/bmw-eadrax-vcs_v4_vehicles.json → ...s/I01_REX/bmw-eadrax-vcs_v4_vehicles.json b/...s/I01_REX/bmw-eadrax-vcs_v4_vehicles.json → ...s/I01_REX/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBY00000000REXI01.json → ..._v4_vehicles_state_WBY00000000REXI01.json b/..._v4_vehicles_state_WBY00000000REXI01.json → ..._v4_vehicles_state_WBY00000000REXI01.json
diff --git a/...-crccs_v2_vehicles_WBA00000000DEMO01.json → ...-crccs_v2_vehicles_WBA00000000DEMO01.json b/...-crccs_v2_vehicles_WBA00000000DEMO01.json → ...-crccs_v2_vehicles_WBA00000000DEMO01.json
diff --git a/...onses/I20/bmw-eadrax-vcs_v4_vehicles.json → ...onses/I20/bmw-eadrax-vcs_v4_vehicles.json b/...onses/I20/bmw-eadrax-vcs_v4_vehicles.json → ...onses/I20/bmw-eadrax-vcs_v4_vehicles.json
diff --git a/..._v4_vehicles_state_WBA00000000DEMO01.json → ..._v4_vehicles_state_WBA00000000DEMO01.json b/..._v4_vehicles_state_WBA00000000DEMO01.json → ..._v4_vehicles_state_WBA00000000DEMO01.json
diff --git a/test/responses/auth/auth_cn_login_error.json → ...s/responses/auth/auth_cn_login_error.json b/test/responses/auth/auth_cn_login_error.json → ...s/responses/auth/auth_cn_login_error.json
diff --git a/test/responses/auth/auth_cn_login_pwd.json → ...sts/responses/auth/auth_cn_login_pwd.json b/test/responses/auth/auth_cn_login_pwd.json → ...sts/responses/auth/auth_cn_login_pwd.json
diff --git a/test/responses/auth/auth_cn_publickey.json → ...sts/responses/auth/auth_cn_publickey.json b/test/responses/auth/auth_cn_publickey.json → ...sts/responses/auth/auth_cn_publickey.json
diff --git a/...ponses/auth/auth_error_internal_error.txt → ...ponses/auth/auth_error_internal_error.txt b/...ponses/auth/auth_error_internal_error.txt → ...ponses/auth/auth_error_internal_error.txt
diff --git a/...onses/auth/auth_error_wrong_password.json → ...onses/auth/auth_error_wrong_password.json b/...onses/auth/auth_error_wrong_password.json → ...onses/auth/auth_error_wrong_password.json
diff --git a/test/responses/auth/auth_slider_captcha.json → ...s/responses/auth/auth_slider_captcha.json b/test/responses/auth/auth_slider_captcha.json → ...s/responses/auth/auth_slider_captcha.json
diff --git a/...onses/auth/auth_slider_captcha_check.json → ...onses/auth/auth_slider_captcha_check.json b/...onses/auth/auth_slider_captcha_check.json → ...onses/auth/auth_slider_captcha_check.json
diff --git a/test/responses/auth/auth_token.json → ...cted/tests/responses/auth/auth_token.json b/test/responses/auth/auth_token.json → ...cted/tests/responses/auth/auth_token.json
diff --git a/...esponses/auth/authorization_response.json → ...esponses/auth/authorization_response.json b/...esponses/auth/authorization_response.json → ...esponses/auth/authorization_response.json
diff --git a/test/responses/auth/oauth_config.json → ...ed/tests/responses/auth/oauth_config.json b/test/responses/auth/oauth_config.json → ...ed/tests/responses/auth/oauth_config.json
diff --git a/...te_services/eadrax_service_delivered.json → ...te_services/eadrax_service_delivered.json b/...te_services/eadrax_service_delivered.json → ...te_services/eadrax_service_delivered.json
diff --git a/...remote_services/eadrax_service_error.json → ...remote_services/eadrax_service_error.json b/...remote_services/eadrax_service_error.json → ...remote_services/eadrax_service_error.json
diff --git a/...ervices/eadrax_service_eventposition.json → ...ervices/eadrax_service_eventposition.json b/...ervices/eadrax_service_eventposition.json → ...ervices/eadrax_service_eventposition.json
diff --git a/...ote_services/eadrax_service_executed.json → ...ote_services/eadrax_service_executed.json b/...ote_services/eadrax_service_executed.json → ...ote_services/eadrax_service_executed.json
diff --git a/...te_services/eadrax_service_initiated.json → ...te_services/eadrax_service_initiated.json b/...te_services/eadrax_service_initiated.json → ...te_services/eadrax_service_initiated.json
diff --git a/...mote_services/eadrax_service_pending.json → ...mote_services/eadrax_service_pending.json b/...mote_services/eadrax_service_pending.json → ...mote_services/eadrax_service_pending.json
diff --git a/test/test_account.py → bimmer_connected/tests/test_account.py b/test/test_account.py → bimmer_connected/tests/test_account.py
diff --git a/test/test_api.py → bimmer_connected/tests/test_api.py b/test/test_api.py → bimmer_connected/tests/test_api.py
diff --git a/test/test_deprecated_vehicle.py → ...onnected/tests/test_deprecated_vehicle.py b/test/test_deprecated_vehicle.py → ...onnected/tests/test_deprecated_vehicle.py
diff --git a/test/test_deprecated_vehicle_status.py → ...d/tests/test_deprecated_vehicle_status.py b/test/test_deprecated_vehicle_status.py → ...d/tests/test_deprecated_vehicle_status.py
diff --git a/test/test_remote_services.py → ...r_connected/tests/test_remote_services.py b/test/test_remote_services.py → ...r_connected/tests/test_remote_services.py
diff --git a/test/test_utils.py → bimmer_connected/tests/test_utils.py b/test/test_utils.py → bimmer_connected/tests/test_utils.py
diff --git a/test/test_vehicle.py → bimmer_connected/tests/test_vehicle.py b/test/test_vehicle.py → bimmer_connected/tests/test_vehicle.py
diff --git a/test/test_vehicle_status.py → ...er_connected/tests/test_vehicle_status.py b/test/test_vehicle_status.py → ...er_connected/tests/test_vehicle_status.py
diff --git a/setup.cfg b/setup.cfg
@@ -35,4 +35,6 @@ console_scripts =
     bimmerconnected = bimmer_connected.cli:main
 
 [options.package_data]
-bimmer_connected = py.typed
+bimmer_connected = 
+    py.typed
+    bimmer_connected/tests/responses/*