Merge branch 'main' of github.com:Kataglyphis/WebDavClient

.github/workflows/pages.yml

@@ -7,7 +7,7 @@ name: Deploy web page with sphinx
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
@@ -25,7 +25,12 @@ jobs:
         run: |
           pip install -v -e .
           pip install -r requirements/docs.txt
-      - name : Build web page
+          pip install -r requirements/test.txt
+      - name: Run tests
+        run: |
+          cd tests
+          pytest
+      - name: Build web page
         run: |
           cd docs
           make html

.gitignore

@@ -1,5 +1,6 @@
 local_data
 assets
+.vscode/launch.json
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+	"python.testing.pytestArgs": [],
+	"python.testing.cwd": "${workspaceFolder}/tests",
+}

pytest.ini

@@ -1,7 +1,7 @@
 [pytest]
 testpaths = tests
-norecursedirs = .git ignore build __pycache__ data docker docs .eggs
+; norecursedirs = .git ignore build __pycache__ data docker docs .eggs
 
-filterwarnings= default
-                ignore:.*No cfgstr given in Cacher constructor or call.*:Warning
-                ignore:.*Define the __nice__ method for.*:Warning
+; filterwarnings= default
+;                 ignore:.*No cfgstr given in Cacher constructor or call.*:Warning
+;                 ignore:.*Define the __nice__ method for.*:Warning

tests/test_webdav_client.py

@@ -9,7 +9,14 @@
 
 
 def cleanup_test_files() -> None:
-    os.removedirs("local_data")
+    try:
+        shutil.rmtree("local_data")
+        shutil.rmtree("local_data2")
+        print(
+            f"The directory local_data and local_data2 and all its contents have been removed successfully."
+        )
+    except OSError as e:
+        print(f"Error : {e.strerror}")
 
 
 def wait_for_server_to_start(url, timeout=10) -> bool:
@@ -29,19 +36,19 @@ def wait_for_server_to_start(url, timeout=10) -> bool:
 def start_webdav_server():
 
     # Start the mock WebDav server
-    # server_process = subprocess.Popen([sys.executable, "mock_webdav_server.py"])
+    server_process = subprocess.Popen(["python", "mock_webdav_server.py"])
     # Wait for the server to start
     # server_started = wait_for_server_to_start("http://localhost:8081")
     # if not server_started:
     #     server_process.terminate()
     #     pytest.fail("Could not start the mock WebDAV server.")
 
-    # time.sleep(10)
+    time.sleep(4)
     yield
 
     # Terminate the server process after all tests are done
-    # server_process.terminate()
-    # server_process.wait()
+    server_process.terminate()
+    server_process.wait()
 
     # Cleanup after tests
     cleanup_test_files()
@@ -109,7 +116,7 @@ def test_download_files(webdav_client) -> None:
 def test_download_all_files_iterative(webdav_client):
 
     remote_base_path = "data"
-    local_base_path = "local_data"
+    local_base_path = "local_data2"
 
     webdav_client.download_all_files_iterative(remote_base_path, local_base_path)
     assert os.path.exists(os.path.join(local_base_path, "Readme.md"))

webdavclient/webdavclient.py

@@ -310,6 +310,9 @@ def download_files(
             self.logger.info("The remote file url is: %s", remote_file_url)
             sub_path = self.get_sub_path(file_path, global_remote_base_path)
 
+            if sub_path.endswith(decoded_filename):
+                sub_path = sub_path[: len(sub_path) - len(decoded_filename)]
+
             if sub_path == decoded_filename:
                 sub_path = ""