Fixed CI tests for master branch (#235)

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

Author: bigcat88

tests/actual_tests/files_test.py

@@ -1055,51 +1055,49 @@ async def test_trashbin_async(anc_any, file_path):
     assert not r
 
 
-@pytest.mark.parametrize(
-    "dest_path",
-    ("/test_dir_tmp/file_versions.txt", "/test_dir_tmp/file_versions-ä.txt", "test_dir_tmp/file_versions-1##3"),
-)
-def test_file_versions(nc_any, dest_path):
+@pytest.mark.parametrize("update_by_id", (False, True))
+def test_file_versions(nc_any, update_by_id):
     if nc_any.check_capabilities("files.versioning"):
         pytest.skip("Need 'Versions' App to be enabled.")
-    for i in (0, 1):
-        nc_any.files.delete(dest_path, not_fail=True)
-        nc_any.files.upload(dest_path, content=b"22")
-        new_file = nc_any.files.upload(dest_path, content=b"333")
-        if i:
-            new_file = nc_any.files.by_id(new_file)
-        versions = nc_any.files.get_versions(new_file)
-        assert versions
-        version_str = str(versions[0])
-        assert version_str.find("File version") != -1
-        assert version_str.find("bytes size") != -1
-        nc_any.files.restore_version(versions[0])
-        time.sleep(0.5)
-        assert nc_any.files.download(new_file) == b"22"
+    dest_path = "/test_dir_tmp/file_versions-ä.txt"
+    nc_any.files.delete(dest_path, not_fail=True)
+    nc_any.files.upload(dest_path, content=b"22")
+    time.sleep(2.0)
+    new_file = nc_any.files.upload(dest_path, content=b"333")
+    if update_by_id:
+        new_file = nc_any.files.by_id(new_file)
+    versions = nc_any.files.get_versions(new_file)
+    assert versions
+    version_str = str(versions[0])
+    assert version_str.find("File version") != -1
+    assert version_str.find("bytes size") != -1
+    time.sleep(2.0)
+    nc_any.files.restore_version(versions[0])
+    time.sleep(2.0)
+    assert nc_any.files.download(new_file) == b"22"
 
 
 @pytest.mark.asyncio(scope="session")
-@pytest.mark.parametrize(
-    "dest_path",
-    ("/test_dir_tmp/file_versions.txt", "/test_dir_tmp/file_versions-ä.txt", "test_dir_tmp/file_versions-1##3"),
-)
-async def test_file_versions_async(anc_any, dest_path):
+@pytest.mark.parametrize("update_by_id", (False, True))
+async def test_file_versions_async(anc_any, update_by_id):
     if await anc_any.check_capabilities("files.versioning"):
         pytest.skip("Need 'Versions' App to be enabled.")
-    for i in (0, 1):
-        await anc_any.files.delete(dest_path, not_fail=True)
-        await anc_any.files.upload(dest_path, content=b"22")
-        new_file = await anc_any.files.upload(dest_path, content=b"333")
-        if i:
-            new_file = await anc_any.files.by_id(new_file)
-        versions = await anc_any.files.get_versions(new_file)
-        assert versions
-        version_str = str(versions[0])
-        assert version_str.find("File version") != -1
-        assert version_str.find("bytes size") != -1
-        await anc_any.files.restore_version(versions[0])
-        time.sleep(0.5)
-        assert await anc_any.files.download(new_file) == b"22"
+    dest_path = "/test_dir_tmp/file_versions-ä-async.txt"
+    await anc_any.files.delete(dest_path, not_fail=True)
+    await anc_any.files.upload(dest_path, content=b"22")
+    time.sleep(2.0)
+    new_file = await anc_any.files.upload(dest_path, content=b"333")
+    if update_by_id:
+        new_file = await anc_any.files.by_id(new_file)
+    versions = await anc_any.files.get_versions(new_file)
+    assert versions
+    version_str = str(versions[0])
+    assert version_str.find("File version") != -1
+    assert version_str.find("bytes size") != -1
+    time.sleep(2.0)
+    await anc_any.files.restore_version(versions[0])
+    time.sleep(2.0)
+    assert await anc_any.files.download(new_file) == b"22"
 
 
 def test_create_update_delete_tag(nc_any):

tests/actual_tests/user_status_test.py

@@ -173,7 +173,7 @@ async def test_set_status_type_async(anc, value):
     assert r.status_type_defined
 
 
-@pytest.mark.parametrize("clear_at", (None, int(time()) + 360))
+@pytest.mark.parametrize("clear_at", (None, int(time()) + 60 * 60 * 9))
 def test_set_predefined(nc, clear_at):
     if nc.srv_version["major"] < 27:
         nc.user_status.set_predefined("meeting")
@@ -189,7 +189,7 @@ def test_set_predefined(nc, clear_at):
 
 
 @pytest.mark.asyncio(scope="session")
-@pytest.mark.parametrize("clear_at", (None, int(time()) + 360))
+@pytest.mark.parametrize("clear_at", (None, int(time()) + 60 * 60 * 9))
 async def test_set_predefined_async(anc, clear_at):
     if (await anc.srv_version)["major"] < 27:
         await anc.user_status.set_predefined("meeting")

tests/actual_tests/weather_status_test.py

@@ -38,13 +38,6 @@ def test_get_set_location(nc_any):
     if loc.address.find("Unknown") != -1:
         pytest.skip("Some network problem on the host")
     assert loc.address.find("Rom") != -1
-    assert nc_any.weather_status.set_location(latitude=41.896655, longitude=12.488776, address="Paris, France")
-    loc = nc_any.weather_status.get_location()
-    assert loc.latitude == 41.896655
-    assert loc.longitude == 12.488776
-    if loc.address.find("Unknown") != -1:
-        pytest.skip("Some network problem on the host")
-    assert loc.address.find("Rom") != -1
 
 
 @pytest.mark.asyncio(scope="session")
@@ -74,13 +67,6 @@ async def test_get_set_location_async(anc_any):
     if loc.address.find("Unknown") != -1:
         pytest.skip("Some network problem on the host")
     assert loc.address.find("Rom") != -1
-    assert await anc_any.weather_status.set_location(latitude=41.896655, longitude=12.488776, address="Paris, France")
-    loc = await anc_any.weather_status.get_location()
-    assert loc.latitude == 41.896655
-    assert loc.longitude == 12.488776
-    if loc.address.find("Unknown") != -1:
-        pytest.skip("Some network problem on the host")
-    assert loc.address.find("Rom") != -1
 
 
 def test_get_set_location_no_lat_lon_address(nc):