From 3ebadf374f81f41e5e1aac8c0ecedba6bc71c6e9 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Fri, 6 Dec 2024 17:17:03 +0100
Subject: [PATCH] MAINT: Use platform-independent tmp and paths
---
integrationtests/test_crawler_main.py | 3 ++-
src/caoscrawler/scanner.py | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/integrationtests/test_crawler_main.py b/integrationtests/test_crawler_main.py
index 793dd6ed..a2eebf4f 100644
--- a/integrationtests/test_crawler_main.py
+++ b/integrationtests/test_crawler_main.py
@@ -18,6 +18,7 @@
#
import logging
+import tempfile
from pathlib import Path
@@ -49,7 +50,7 @@ def test_list_of_paths(clear_database, monkeypatch):
monkeypatch.setattr(crawl, "_update_status_record", _mock_update_status_record)
# mock SSS environment
- monkeypatch.setenv("SHARED_DIR", "/tmp")
+ monkeypatch.setenv("SHARED_DIR", tempfile.gettempdir())
# We need only one dummy RT
rt = db.RecordType(name="TestType").insert()
diff --git a/src/caoscrawler/scanner.py b/src/caoscrawler/scanner.py
index 6b4d7a12..af1f4173 100644
--- a/src/caoscrawler/scanner.py
+++ b/src/caoscrawler/scanner.py
@@ -465,8 +465,8 @@ def scan_directory(dirname: Union[str, list[str]], crawler_definition_path: str,
# TODO: needs to be covered somewhere else
crawled_directory = dname
- if not dir_structure_name and dname.endswith('/'):
- if dname == '/':
+ if not dir_structure_name and dname.endswith(os.path.sep):
+ if dname == os.path.sep:
# Crawling the entire file system
dir_structure_name = "root"
else:
--
GitLab