2
0
Эх сурвалжийг харах

remote archiver prefix check

bigtedde 1 жил өмнө
parent
commit
8a5664dcfd

+ 2 - 2
src/borg/testsuite/archiver/check_cmd.py

@@ -279,7 +279,7 @@ def test_manifest_rebuild_duplicate_archive(archivers, request):
 
 def test_extra_chunks(archivers, request):
     archiver = request.getfixturevalue(archivers)
-    if archiver.prefix:
+    if archiver.prefix == "ssh://__testsuite__":
         pytest.skip("only works locally")
     repo_location = archiver.repository_location
     check_cmd_setup(archiver)
@@ -328,7 +328,7 @@ def test_verify_data(archivers, request, init_args):
 
 def test_empty_repository(archivers, request):
     archiver = request.getfixturevalue(archivers)
-    if archiver.prefix:
+    if archiver.prefix == "ssh://__testsuite__":
         pytest.skip("only works locally")
     repo_location = archiver.repository_location
     check_cmd_setup(archiver)

+ 1 - 1
src/borg/testsuite/archiver/checks.py

@@ -279,7 +279,7 @@ def test_unknown_feature_on_mount(archivers, request):
 def test_unknown_mandatory_feature_in_cache(archivers, request):
     archiver = request.getfixturevalue(archivers)
     repo_location, repo_path = archiver.repository_location, archiver.repository_path
-    remote_repo = bool(archiver.prefix)
+    remote_repo = True if archiver.prefix == "ssh://__testsuite__" else False
     print(cmd(archiver, f"--repo={repo_location}", "rcreate", RK_ENCRYPTION))
 
     with Repository(repo_path, exclusive=True) as repository:

+ 1 - 1
src/borg/testsuite/archiver/transfer_cmd.py

@@ -44,7 +44,7 @@ def test_transfer(archivers, request):
 
 def test_transfer_upgrade(archivers, request):
     archiver = request.getfixturevalue(archivers)
-    if archiver.prefix or archiver.EXE:
+    if archiver.prefix == "ssh://__testsuite__" or archiver.EXE == "borg.exe":
         pytest.skip("only works locally")
     repo_location = archiver.repository_location