Merge pull request #1 from cloud-py-api/tests-fix

fixed tests with Oracle

Author: bigcat88

.github/.codecov.yml

@@ -1,6 +1,6 @@
 codecov:
   notify:
-    after_n_builds: 2
+    after_n_builds: 3
 
 comment:
   require_changes: true

.github/workflows/analysis-coverage.yml

@@ -108,7 +108,7 @@ jobs:
           php occ config:system:set allow_local_remote_servers --value true
           php -S localhost:8080 &
 
-      - name: Checkout nc_py_api
+      - name: Checkout NcPyApi
         uses: actions/checkout@v3
         with:
           path: nc_py_api
@@ -135,12 +135,12 @@ jobs:
           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
+          -e --force-scopes --system-app
           kill -9 $(cat /tmp/_install.pid)
 
       - name: Generate coverage report
         working-directory: nc_py_api
-        run: coverage run -m pytest -rs && coverage xml && coverage html
+        run: coverage run -m pytest && coverage xml && coverage html
 
       - name: HTML coverage to artifacts
         uses: actions/upload-artifact@v3
@@ -232,12 +232,12 @@ jobs:
           php occ maintenance:install --verbose --database=pgsql --database-name=${{ env.NC_dbname }} \
           --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword \
           --admin-user admin --admin-pass adminpassword
-          php occ config:system:set loglevel --value 1
+          php occ config:system:set loglevel --value=1
           php occ config:system:set debug --value=true --type=boolean
           php occ config:system:set allow_local_remote_servers --value true
           php -S localhost:8080 &
 
-      - name: Checkout nc_py_api
+      - name: Checkout NcPyApi
         uses: actions/checkout@v3
         with:
           path: nc_py_api
@@ -264,12 +264,12 @@ jobs:
           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
+          -e --force-scopes --system-app
           kill -9 $(cat /tmp/_install.pid)
 
       - name: Generate coverage report
         working-directory: nc_py_api
-        run: coverage run -m pytest -rs && coverage xml && coverage html
+        run: coverage run -m pytest && coverage xml && coverage html
 
       - name: HTML coverage to artifacts
         uses: actions/upload-artifact@v3
@@ -333,7 +333,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, \
-            pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, oci8
+            posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, oci8
 
       - uses: actions/setup-python@v4
         with:
@@ -357,12 +357,12 @@ jobs:
           php occ maintenance:install --verbose --database=oci --database-name=XE \
           --database-host=127.0.0.1 --database-port=1521 --database-user=useroracle --database-pass=userpassword \
           --admin-user admin --admin-pass admin
-          php occ config:system:set loglevel --value=0 --type=integer
+          php occ config:system:set loglevel --value=1 --type=integer
           php occ config:system:set debug --value=true --type=boolean
           php occ config:system:set allow_local_remote_servers --value true
           php -S localhost:8080 &
 
-      - name: Checkout nc_py_api
+      - name: Checkout NcPyApi
         uses: actions/checkout@v3
         with:
           path: nc_py_api
@@ -389,12 +389,14 @@ jobs:
           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
+          -e --force-scopes --system-app
           kill -9 $(cat /tmp/_install.pid)
 
       - name: Generate coverage report
         working-directory: nc_py_api
-        run: coverage run -m pytest -rs && coverage xml && coverage html
+        run: coverage run -m pytest && coverage xml && coverage html
+        env:
+          SKIP_NC_WO_AE: 1
 
       - name: HTML coverage to artifacts
         uses: actions/upload-artifact@v3
@@ -411,10 +413,6 @@ jobs:
           fail_ci_if_error: true
           verbose: true
 
-      - name: Setup tmate session
-        if: always()
-        uses: mxschmitt/action-tmate@v3
-
       - name: Upload NC logs
         if: always()
         uses: actions/upload-artifact@v3

nc_py_api/preferences.py

@@ -13,7 +13,7 @@ def __init__(self, session: NcSessionBasic):
         self._session = session
 
     @property
-    def avalaible(self) -> bool:
+    def available(self) -> bool:
         return not check_capabilities("provisioning_api", self._session.capabilities)
 
     def set(self, app_name: str, key: str, value: str) -> None:

nc_py_api/users_statuses.py

@@ -37,7 +37,7 @@ def __init__(self, session: NcSessionBasic):
         self._session = session
 
     @property
-    def avalaible(self) -> bool:
+    def available(self) -> bool:
         return not check_capabilities("user_status", self._session.capabilities)
 
     def get_all(self, limit: Optional[int] = None, offset: Optional[int] = None) -> list[UserStatus]:

pyproject.toml

@@ -21,7 +21,7 @@ filterwarnings = [
     "ignore::DeprecationWarning",
 ]
 log_cli = true
-addopts = "--color=yes"
+addopts = "-rs --color=yes"
 
 [tool.coverage.run]
 cover_pylib = true

tests/appconfig_preferences_ex_test.py

@@ -2,17 +2,23 @@
 
 from nc_py_api import NextcloudException
 
-from gfixture import NC_TO_TEST
-NC_APP = NC_TO_TEST[1] if len(NC_TO_TEST) > 1 else None
+from gfixture import NC_APP
 
 
 if NC_APP is None or "app_ecosystem_v2" not in NC_APP.capabilities:
     pytest.skip("app_ecosystem_v2 is not installed.", allow_module_level=True)
 
 
-@pytest.mark.parametrize("value", ("0", "1", "12 3", ""))
 @pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
-def test_preferences_ex_set_delete(value, class_to_test):
+def test_cfg_ex_set_empty_key(class_to_test):
+    with pytest.raises(NextcloudException):
+        class_to_test.set("", "some value")
+
+
+# @pytest.mark.parametrize("value", ("0", "1", "12 3", ""))
+@pytest.mark.parametrize("value", ("0", "1", "12 3"))
+@pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
+def test_cfg_ex_set_delete(value, class_to_test):
     class_to_test.delete("test_key")
     assert class_to_test.get_value("test_key") is None
     class_to_test.set("test_key", value)
@@ -24,15 +30,7 @@ def test_preferences_ex_set_delete(value, class_to_test):
 
 
 @pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
-def test_preferences_ex_set_empty_param(class_to_test):
-    class_to_test.set("", "123")
-    assert class_to_test.get_value("") == "123"
-    class_to_test.delete("")
-    assert class_to_test.get_value("") is None
-
-
-@pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
-def test_preferences_ex_delete(class_to_test):
+def test_cfg_ex_delete(class_to_test):
     class_to_test.set("test_key", "123")
     assert class_to_test.get_value("test_key")
     class_to_test.delete("test_key")
@@ -43,7 +41,7 @@ def test_preferences_ex_delete(class_to_test):
 
 
 @pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
-def test_preferences_ex_multiply_delete(class_to_test):
+def test_cfg_ex_multiply_delete(class_to_test):
     class_to_test.set("test_key", "123")
     class_to_test.set("test_key2", "123")
     assert len(class_to_test.get_values(["test_key", "test_key2"])) == 2
@@ -56,9 +54,9 @@ def test_preferences_ex_multiply_delete(class_to_test):
     assert len(class_to_test.get_values(["test_key", "test_key2"])) == 0
 
 
-@pytest.mark.parametrize("key", ("k", "k y", "", " "))
+@pytest.mark.parametrize("key", ("k", "k y", " "))
 @pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
-def test_preferences_ex_get_non_existing(key, class_to_test):
+def test_cfg_ex_get_non_existing(key, class_to_test):
     try:
         class_to_test.delete(key)
     except NextcloudException:
@@ -69,7 +67,7 @@ def test_preferences_ex_get_non_existing(key, class_to_test):
 
 
 @pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
-def test_preferences_ex_get(class_to_test):
+def test_cfg_ex_get(class_to_test):
     class_to_test.delete(["test key", "test key2"])
     assert len(class_to_test.get_values(["test key", "test key2"])) == 0
     class_to_test.set("test key", "123")
@@ -80,7 +78,7 @@ def test_preferences_ex_get(class_to_test):
 
 
 @pytest.mark.parametrize("class_to_test", (NC_APP.appconfig_ex_api, NC_APP.preferences_ex_api))
-def test_preferences_ex_get_typing(class_to_test):
+def test_cfg_ex_get_typing(class_to_test):
     class_to_test.set("test key", "123")
     class_to_test.set("test key2", "321")
     r = class_to_test.get_values(["test key", "test key2"])

tests/apps_test.py

@@ -1,5 +1,7 @@
 import pytest
 
+from nc_py_api import Nextcloud
+
 from gfixture import NC_TO_TEST
 
 APP_NAME = "files_trashbin"
@@ -19,6 +21,7 @@ def test_list_apps(nc):
     assert APP_NAME in apps
 
 
+@pytest.mark.skipif(not isinstance(NC_TO_TEST[:1], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_enable_disable_app(nc):
     assert nc.apps.is_installed(APP_NAME)

tests/gfixture.py

@@ -13,13 +13,18 @@
     environ["app_version"] = "1.0.0"
     environ["app_secret"] = secret
 
-nc = Nextcloud()
-nc_app = NextcloudApp(user="admin")
-if "app_ecosystem_v2" not in nc_app.capabilities:
-    nc_app = None
+NC = Nextcloud()
+if environ.get("SKIP_NC_WO_AE", False):
+    NC = None
 
-NC_TO_TEST = [nc]
-if nc_app:
-    NC_TO_TEST.append(nc_app)
+NC_APP = NextcloudApp(user="admin")
+if "app_ecosystem_v2" not in NC_APP.capabilities:
+    NC_APP = None
 
-NC_VERSION = nc.srv_version
+NC_TO_TEST = []
+if NC:
+    NC_TO_TEST.append(NC)
+if NC_APP:
+    NC_TO_TEST.append(NC_APP)
+
+NC_VERSION = NC_TO_TEST[0].srv_version if NC_TO_TEST else {}

tests/groups_test.py

@@ -1,12 +1,13 @@
 import pytest
 
-from nc_py_api import NextcloudException
+from nc_py_api import NextcloudException, Nextcloud
 
 from gfixture import NC_TO_TEST
 
 TEST_GROUP_NAME = "test_coverage_group"
 
 
+@pytest.mark.skipif(not isinstance(NC_TO_TEST[:1], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_create_delete_group(nc):
     try:
@@ -21,6 +22,7 @@ def test_create_delete_group(nc):
         nc.users_groups.delete(TEST_GROUP_NAME)
 
 
+@pytest.mark.skipif(not isinstance(NC_TO_TEST[:1], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_list_group(nc):
     try:
@@ -44,6 +46,7 @@ def test_list_group(nc):
     nc.users_groups.delete(TEST_GROUP_NAME + "2")
 
 
+@pytest.mark.skipif(not isinstance(NC_TO_TEST[:1], Nextcloud), reason="Not available for NextcloudApp.")
 @pytest.mark.parametrize("nc", NC_TO_TEST[:1])
 def test_group_members_promote_demote(nc):
     try:

tests/logs_test.py

@@ -4,9 +4,7 @@
 
 from nc_py_api import LogLvl, NextcloudException
 
-from gfixture import NC_TO_TEST
-NC_APP = NC_TO_TEST[1] if len(NC_TO_TEST) > 1 else None
-
+from gfixture import NC_APP
 
 if NC_APP is None or "app_ecosystem_v2" not in NC_APP.capabilities:
     pytest.skip("app_ecosystem_v2 is not installed.", allow_module_level=True)
@@ -45,7 +43,7 @@ def test_loglvl_equal():
 
 @pytest.mark.skipif(AE_CAPABILITIES.get("loglevel", LogLvl.FATAL) == LogLvl.DEBUG, reason="Log lvl to low")
 def test_loglvl_less():
-    with mock.patch("gfixture.nc_app._session._ocs") as _ocs:
+    with mock.patch("gfixture.NC_APP._session._ocs") as _ocs:
         NC_APP.log(int(AE_CAPABILITIES["loglevel"]) - 1, "will not be sent")
         _ocs.assert_not_called()
         NC_APP.log(AE_CAPABILITIES["loglevel"], "will be sent")
@@ -58,7 +56,7 @@ def test_log_without_app_ecosystem_v2():
     log_lvl = srv_capabilities["app_ecosystem_v2"].pop("loglevel")
     srv_capabilities.pop("app_ecosystem_v2")
     patched_capabilities = {"capabilities": srv_capabilities, "version": srv_version}
-    with mock.patch.dict("gfixture.nc_app._session._capabilities", patched_capabilities, clear=True):
-        with mock.patch("gfixture.nc_app._session._ocs") as _ocs:
+    with mock.patch.dict("gfixture.NC_APP._session._capabilities", patched_capabilities, clear=True):
+        with mock.patch("gfixture.NC_APP._session._ocs") as _ocs:
             NC_APP.log(log_lvl, "will not be sent")
             _ocs.assert_not_called()