+tests as application (#13)

added run during installation to coverage

Author: bigcat88

.github/workflows/analysis-coverage.yml

@@ -129,18 +129,21 @@ jobs:
         run: |
           patch -p 1 -i apps/app_ecosystem_v2/base_php.patch
           php occ app:enable app_ecosystem_v2
-          python3 nc_py_api/tests/_install.py &
+          cd nc_py_api
+          coverage run --data-file=.coverage.ci_install tests/_install.py &
           echo $! > /tmp/_install.pid
+          cd ..
           sleep 5s
           php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \
           --host 127.0.0.1 --port 9002 \
           --secret $app_secret \
           -e --force-scopes --system-app
-          kill -9 $(cat /tmp/_install.pid)
+          kill -15 $(cat /tmp/_install.pid)
+          timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
 
       - name: Generate coverage report
         working-directory: nc_py_api
-        run: coverage run -m pytest && coverage xml && coverage html
+        run: coverage run --data-file=.coverage.ci -m pytest && coverage combine && coverage xml && coverage html
 
       - name: HTML coverage to artifacts
         uses: actions/upload-artifact@v3
@@ -258,18 +261,21 @@ jobs:
         run: |
           patch -p 1 -i apps/app_ecosystem_v2/base_php.patch
           php occ app:enable app_ecosystem_v2
-          python3 nc_py_api/tests/_install.py &
+          cd nc_py_api
+          coverage run --data-file=.coverage.ci_install tests/_install.py &
           echo $! > /tmp/_install.pid
+          cd ..
           sleep 5s
           php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \
           --host 127.0.0.1 --port 9002 \
           --secret $app_secret \
           -e --force-scopes --system-app
-          kill -9 $(cat /tmp/_install.pid)
+          kill -15 $(cat /tmp/_install.pid)
+          timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
 
       - name: Generate coverage report
         working-directory: nc_py_api
-        run: coverage run -m pytest && coverage xml && coverage html
+        run: coverage run --data-file=.coverage.ci -m pytest && coverage combine && coverage xml && coverage html
 
       - name: HTML coverage to artifacts
         uses: actions/upload-artifact@v3
@@ -373,28 +379,29 @@ jobs:
 
       - name: Checkout AppEcosystemV2
         uses: actions/checkout@v3
-        if: ${{ !startsWith(matrix.nextcloud, '26.') }}
         with:
           path: apps/app_ecosystem_v2
           repository: cloud-py-api/app_ecosystem_v2
 
       - name: Install AppEcosystemV2
-        if: ${{ !startsWith(matrix.nextcloud, '26.') }}
         run: |
           patch -p 1 -i apps/app_ecosystem_v2/base_php.patch
           php occ app:enable app_ecosystem_v2
-          python3 nc_py_api/tests/_install.py &
+          cd nc_py_api
+          coverage run --data-file=.coverage.ci_install tests/_install.py &
           echo $! > /tmp/_install.pid
+          cd ..
           sleep 5s
           php occ app_ecosystem_v2:app:register $app_name $app_version "NcPyApi" \
           --host 127.0.0.1 --port 9002 \
           --secret $app_secret \
           -e --force-scopes --system-app
-          kill -9 $(cat /tmp/_install.pid)
+          kill -15 $(cat /tmp/_install.pid)
+          timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
 
       - name: Generate coverage report
         working-directory: nc_py_api
-        run: coverage run -m pytest && coverage xml && coverage html
+        run: coverage run --data-file=.coverage.ci -m pytest && coverage combine && coverage xml && coverage html
         env:
           SKIP_NC_WO_AE: 1
 

nc_py_api/_session.py

@@ -311,15 +311,9 @@ def sign_check(self, request: Request):
         data = asyncio.run(request.body())
         if data:
             data_hash.update(data)
-            # try:
-            #     data_hash.update(
-            #         dumps(loads(data, parse_int=str, parse_float=str), separators=(",", ":")).encode("UTF-8")
-            #     )
-            # except (JSONDecodeError, TypeError):
-            #     data_hash.update(data)
         ae_data_hash = data_hash.hexdigest()
         if ae_data_hash != headers["AE-DATA-HASH"]:
             raise ValueError(f"Invalid AE-DATA-HASH:{ae_data_hash} !={headers['AE-DATA-HASH']}")
-        # if headers["EX-APP-ID"] != self.cfg.app_name:
-        #     raise ValueError(f"Invalid EX-APP-ID:{headers['EX-APP-ID']} != {self.cfg.app_name}")
+        if headers["EX-APP-ID"] != self.cfg.app_name:
+            raise ValueError(f"Invalid EX-APP-ID:{headers['EX-APP-ID']} != {self.cfg.app_name}")
         return True

nc_py_api/nextcloud.py

@@ -51,6 +51,9 @@ def srv_version(self) -> ServerVersion:
     def check_capabilities(self, capabilities: Union[str, list[str]]) -> list[str]:
         return check_capabilities(capabilities, self.capabilities)
 
+    def update_server_info(self) -> None:
+        self._session.update_server_info()
+
     @property
     def theme(self) -> Optional[ThemingInfo]:
         return get_parsed_theme(self.capabilities["theming"]) if "theming" in self.capabilities else None

pyproject.toml

@@ -28,6 +28,12 @@ cover_pylib = true
 include = ["*/nc_py_api/*"]
 omit = ["*/tests/*"]
 
+[tool.coverage.paths]
+source = [
+    "nc_py_api/",
+    "*/site-packages/nc_py_api/"
+]
+
 [tool.coverage.report]
 exclude_lines = [
     "pragma: no cover",

tests/_install.py

@@ -24,4 +24,4 @@ def initialization():
 
 if __name__ == "__main__":
     urllib3.disable_warnings()
-    uvicorn.run("_install:APP", host="0.0.0.0", port=9002, log_level='trace', reload=False)
+    uvicorn.run("_install:APP", host="0.0.0.0", port=9002, log_level='trace')

tests/nc_app_test.py

@@ -0,0 +1,52 @@
+import pytest
+
+from gfixture import NC_APP, NC
+
+from nc_py_api import ApiScope
+
+
+if NC_APP is None:
+    pytest.skip("Only for Nextcloud App mode", allow_module_level=True)
+
+
+def test_get_users_list():
+    users = NC_APP.users_list()
+    assert users
+    assert NC_APP.user in users
+
+
+def test_scope_allowed():
+    for i in ApiScope:
+        assert NC_APP.scope_allowed(i)
+    assert not NC_APP.scope_allowed(0)
+    assert not NC_APP.scope_allowed(999999999)
+
+
+@pytest.mark.skipif(NC is None, reason="Usual Nextcloud mode required for the test")
+def test_scope_allow_app_ecosystem_disabled():
+    NC.apps.disable("app_ecosystem_v2")
+    try:
+        assert NC_APP.scope_allowed(ApiScope.DAV)
+        NC_APP.update_server_info()
+        assert not NC_APP.scope_allowed(ApiScope.DAV)
+    finally:
+        NC.apps.enable("app_ecosystem_v2")
+        NC_APP.update_server_info()
+
+
+def test_change_user():
+    orig_user = NC_APP.user
+    try:
+        orig_capabilities = NC_APP.capabilities
+        assert NC_APP.users_status.available
+        NC_APP.user = ""
+        assert not NC_APP.users_status.available
+        assert orig_capabilities != NC_APP.capabilities
+    finally:
+        NC_APP.user = orig_user
+    assert orig_capabilities == NC_APP.capabilities
+
+
+@pytest.mark.skipif(NC is None, reason="Usual Nextcloud mode required for the test")
+def test_register_new_app():
+    pass