dev: fixed tests with Oracle(2)

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>

Author: bigcat88

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]:

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/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

@@ -43,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")
@@ -56,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()

tests/preferences_test.py

@@ -6,23 +6,23 @@
 
 
 @pytest.mark.parametrize("nc", NC_TO_TEST)
-def test_avalaible(nc):
-    assert nc.preferences_api.avalaible
+def test_available(nc):
+    assert nc.preferences_api.available
 
 
 @pytest.mark.parametrize("nc", NC_TO_TEST)
 def test_preferences_set(nc):
-    if not nc.preferences_api.avalaible:
-        pytest.skip("preferences_api is not avalaible")
+    if not nc.preferences_api.available:
+        pytest.skip("preferences_api is not available")
     nc.preferences_api.set("dav", key="user_status_automation", value="yes")
     with pytest.raises(NextcloudException):
         nc.preferences_api.set("non_existing_app", "some_cfg_name", "2")
 
 
 @pytest.mark.parametrize("nc", NC_TO_TEST)
 def test_preferences_delete(nc):
-    if not nc.preferences_api.avalaible:
-        pytest.skip("preferences_api is not avalaible")
+    if not nc.preferences_api.available:
+        pytest.skip("preferences_api is not available")
     nc.preferences_api.delete("dav", key="user_status_automation")
     with pytest.raises(NextcloudException):
         nc.preferences_api.delete("non_existing_app", "some_cfg_name")

tests/users_statuses_test.py

@@ -7,8 +7,8 @@
 
 
 @pytest.mark.parametrize("nc", NC_TO_TEST)
-def test_avalaible(nc):
-    assert nc.users_statuses.avalaible
+def test_available(nc):
+    assert nc.users_statuses.available
 
 
 def compare_user_statuses(p1, p2):
@@ -36,8 +36,8 @@ def test_get_status(nc, message):
     assert not r1["messageIsPredefined"]
 
 
-@pytest.mark.parametrize("nc", NC_TO_TEST)
 @pytest.mark.skipif(NC_VERSION.get("major", 0) < 27, reason="NC27 required.")
+@pytest.mark.parametrize("nc", NC_TO_TEST)
 def test_get_predefined(nc):
     r = nc.users_statuses.get_predefined()
     assert isinstance(r, list)
@@ -89,9 +89,9 @@ def test_set_status_type(nc, value):
     assert r["statusIsUserDefined"]
 
 
+@pytest.mark.skipif(NC_VERSION.get("major", 0) < 27, reason="NC27 required.")
 @pytest.mark.parametrize("nc", NC_TO_TEST)
 @pytest.mark.parametrize("clear_at", (None, int(time()) + 360))
-@pytest.mark.skipif(NC_VERSION.get("major", 0) < 27, reason="NC27 required.")
 def test_set_predefined(nc, clear_at):
     predefined_statuses = nc.users_statuses.get_predefined()
     for i in predefined_statuses:

tests/users_test.py

@@ -1,6 +1,6 @@
 import pytest
 
-from nc_py_api import NextcloudException
+from nc_py_api import NextcloudException, Nextcloud
 
 from gfixture import NC_TO_TEST
 
@@ -21,6 +21,7 @@ def test_get_user_404(nc):
         nc.users.get("non existing user")
 
 
+@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_user(nc):
     try:
@@ -32,6 +33,7 @@ def test_create_user(nc):
         nc.users.create(TEST_USER_NAME, password=TEST_USER_PASSWORD)
 
 
+@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_delete_user(nc):
     try:
@@ -43,6 +45,7 @@ def test_delete_user(nc):
         nc.users.delete(TEST_USER_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_users(nc):
     try:
@@ -59,6 +62,7 @@ def test_list_users(nc):
     nc.users.delete(TEST_USER_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_enable_disable_user(nc):
     try: