bug: fix compact_after_delete

KenKundert · Mar 29, 2022 · e809fb3 · e809fb3
1 parent db59ec6
commit e809fb3
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 37 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -21,7 +21,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Borg
-        run: sudo apt install borgbackup
+        run: sudo apt install borgbackup=1.2.\*
       - name: Install packages
         run:
           python -m pip install --upgrade pip

diff --git a/emborg/command.py b/emborg/command.py
@@ -833,14 +833,14 @@ def run(cls, command, args, settings, options):
             if settings.compact_after_delete:
                 narrate("Compacting repository ...")
                 compact = CompactCommand()
-                compact_status = compact.run("compact", args, settings, options)
+                compact_status = compact.run("compact", [], settings, options)
             else:
                 compact_status = 0
 
         except Error as e:
             e.reraise(
                 codicil = (
-                    f"This error occurred while compacting the repository.",
+                    "This error occurred while compacting the repository.",
                     "No error was reported while deleting the archive.",
                 )
             )
@@ -1769,14 +1769,14 @@ def run(cls, command, args, settings, options):
             if settings.compact_after_delete:
                 narrate("Compacting repository ...")
                 compact = CompactCommand()
-                compact_status = compact.run("compact", args, settings, options)
+                compact_status = compact.run("compact", [], settings, options)
             else:
                 compact_status = 0
 
         except Error as e:
             e.reraise(
                 codicil = (
-                    f"This error occurred while compacting the repository.",
+                    "This error occurred while compacting the repository.",
                     "No error was reported while pruning the repository.",
                 )
             )

diff --git a/tests/CONFIGS/settings b/tests/CONFIGS/settings
@@ -1,7 +1,7 @@
 # These settings are common to all configurations
 # configurations
 configurations = '''
-    test0 test1 test2 test3 test4 test5 test6 test7 test8
+    test0 test1 test2 test3 test4 test5 test6 test7 test8 test9
     tests=test0,test1,test2,test3
 '''
 

diff --git a/tests/CONFIGS/test9 b/tests/CONFIGS/test9
@@ -0,0 +1,8 @@
+patterns = '''
+    R ~
+    + ~/configs
+    - ~
+    - fm:*/.viminfo
+    - ~/**/.*.swp
+    - **/.*.swo
+'''
diff --git a/tests/test-cases.nt b/tests/test-cases.nt
@@ -332,6 +332,7 @@ emborg with configs:
             >     test6
             >     test7
             >     test8
+            >     test9
             >     tests=test0,test1,test2,test3
             >
             > Default Configuration:
@@ -346,7 +347,7 @@ emborg with configs:
             >              config_dir: '/⟪EMBORG⟫/tests/.config/emborg'
             >             config_name: 'test0'
             >          configurations: """
-            >                              test0 test1 test2 test3 test4 test5 test6 test7 test8
+            >                              test0 test1 test2 test3 test4 test5 test6 test7 test8 test9
             >                              tests=test0,test1,test2,test3
             >                          """
             >   default_configuration: 'tests'
@@ -481,6 +482,7 @@ emborg with configs:
             > ⟪EMBORG⟫/tests/configs/test7
             > ⟪EMBORG⟫/tests/configs/test7patterns
             > ⟪EMBORG⟫/tests/configs/test8
+            > ⟪EMBORG⟫/tests/configs/test9
         expected_type: regex
 
     shiver:
@@ -502,6 +504,7 @@ emborg with configs:
             > ⟪EMBORG⟫/tests/configs/test7
             > ⟪EMBORG⟫/tests/configs/test7patterns
             > ⟪EMBORG⟫/tests/configs/test8
+            > ⟪EMBORG⟫/tests/configs/test9
         expected_type: regex
 
     whiplash:
@@ -640,7 +643,7 @@ emborg with configs:
             > run_before_borg on test0
             > run_after_borg on test0
         dependencies: fuse
-            # if this test fails with 'EMBORG: Mountpoint must be a writable', 
+            # if this test fails with “EMBORG: Mountpoint must be a writable”,
             # it is because EMBORG is still mounted from a previous run.
 
     whitewash:
@@ -711,14 +714,15 @@ emborg with configs:
             >       66 tests/configs/test2excludes
             >       82 tests/configs/test6patterns
             >       87 tests/configs/test7
+            >      105 tests/configs/test9
             >      111 tests/configs/test7patterns
             >      132 tests/configs/test6
             >      182 tests/configs/test8
             >      191 tests/configs/test5
             >      526 tests/configs/test0
             >      556 tests/configs/overdue.conf
             >      559 tests/configs/test2
-            >      594 tests/configs/settings
+            >      600 tests/configs/settings
             >      612 tests/configs/test1
             >      671 tests/configs/test3
             >      965 tests/configs/test4
@@ -869,6 +873,7 @@ emborg with configs:
             > ⟪EMBORG⟫/tests/configs/test7
             > ⟪EMBORG⟫/tests/configs/test7patterns
             > ⟪EMBORG⟫/tests/configs/test8
+            > ⟪EMBORG⟫/tests/configs/test9
         expected_type: regex
 
     bobbin:
@@ -881,24 +886,25 @@ emborg with configs:
         args: --quiet --config test5 extract /⟪EMBORG⟫/tests/configs
         expected:
             > ⟪EMBORG⟫/tests/configs
-            > ⟪EMBORG⟫/tests/configs/test6patterns
-            > ⟪EMBORG⟫/tests/configs/test2excludes
-            > ⟪EMBORG⟫/tests/configs/test2
-            > ⟪EMBORG⟫/tests/configs/test2passphrase
-            > ⟪EMBORG⟫/tests/configs/test7patterns
             > ⟪EMBORG⟫/tests/configs/overdue.conf
-            > ⟪EMBORG⟫/tests/configs/test3
             > ⟪EMBORG⟫/tests/configs/README
             > ⟪EMBORG⟫/tests/configs/settings
-            > ⟪EMBORG⟫/tests/configs/test6
-            > ⟪EMBORG⟫/tests/configs/test7
-            > ⟪EMBORG⟫/tests/configs/test8
+            > ⟪EMBORG⟫/tests/configs/subdir
+            > ⟪EMBORG⟫/tests/configs/subdir/file
             > ⟪EMBORG⟫/tests/configs/test0
-            > ⟪EMBORG⟫/tests/configs/test5
             > ⟪EMBORG⟫/tests/configs/test1
+            > ⟪EMBORG⟫/tests/configs/test2
+            > ⟪EMBORG⟫/tests/configs/test2excludes
+            > ⟪EMBORG⟫/tests/configs/test2passphrase
+            > ⟪EMBORG⟫/tests/configs/test3
             > ⟪EMBORG⟫/tests/configs/test4
-            > ⟪EMBORG⟫/tests/configs/subdir
-            > ⟪EMBORG⟫/tests/configs/subdir/file
+            > ⟪EMBORG⟫/tests/configs/test5
+            > ⟪EMBORG⟫/tests/configs/test6
+            > ⟪EMBORG⟫/tests/configs/test6patterns
+            > ⟪EMBORG⟫/tests/configs/test7
+            > ⟪EMBORG⟫/tests/configs/test7patterns
+            > ⟪EMBORG⟫/tests/configs/test8
+            > ⟪EMBORG⟫/tests/configs/test9
         expected_type: sort-lines
         cmp_dirs: ⟪EMBORG⟫/tests/configs configs
 
@@ -907,24 +913,25 @@ emborg with configs:
         args: --quiet --config test5 restore configs
         expected:
             > ⟪EMBORG⟫/tests/configs
-            > ⟪EMBORG⟫/tests/configs/test6patterns
-            > ⟪EMBORG⟫/tests/configs/test2excludes
-            > ⟪EMBORG⟫/tests/configs/test2
-            > ⟪EMBORG⟫/tests/configs/test2passphrase
-            > ⟪EMBORG⟫/tests/configs/test7patterns
             > ⟪EMBORG⟫/tests/configs/overdue.conf
-            > ⟪EMBORG⟫/tests/configs/test3
             > ⟪EMBORG⟫/tests/configs/README
             > ⟪EMBORG⟫/tests/configs/settings
-            > ⟪EMBORG⟫/tests/configs/test6
-            > ⟪EMBORG⟫/tests/configs/test7
-            > ⟪EMBORG⟫/tests/configs/test8
+            > ⟪EMBORG⟫/tests/configs/subdir
+            > ⟪EMBORG⟫/tests/configs/subdir/file
             > ⟪EMBORG⟫/tests/configs/test0
-            > ⟪EMBORG⟫/tests/configs/test5
             > ⟪EMBORG⟫/tests/configs/test1
+            > ⟪EMBORG⟫/tests/configs/test2
+            > ⟪EMBORG⟫/tests/configs/test2excludes
+            > ⟪EMBORG⟫/tests/configs/test2passphrase
+            > ⟪EMBORG⟫/tests/configs/test3
             > ⟪EMBORG⟫/tests/configs/test4
-            > ⟪EMBORG⟫/tests/configs/subdir
-            > ⟪EMBORG⟫/tests/configs/subdir/file
+            > ⟪EMBORG⟫/tests/configs/test5
+            > ⟪EMBORG⟫/tests/configs/test6
+            > ⟪EMBORG⟫/tests/configs/test6patterns
+            > ⟪EMBORG⟫/tests/configs/test7
+            > ⟪EMBORG⟫/tests/configs/test7patterns
+            > ⟪EMBORG⟫/tests/configs/test8
+            > ⟪EMBORG⟫/tests/configs/test9
         expected_type: sort-lines
         cmp_dirs: CONFIGS configs
 
@@ -972,14 +979,15 @@ emborg with configs:
             >       66 tests/configs/test2excludes
             >       82 tests/configs/test6patterns
             >       87 tests/configs/test7
+            >      105 tests/configs/test9
             >      111 tests/configs/test7patterns
             >      132 tests/configs/test6
             >      182 tests/configs/test8
             >      191 tests/configs/test5
             >      526 tests/configs/test0
             >      556 tests/configs/overdue.conf
             >      559 tests/configs/test2
-            >      594 tests/configs/settings
+            >      600 tests/configs/settings
             >      612 tests/configs/test1
             >      671 tests/configs/test3
             >      965 tests/configs/test4
@@ -1225,6 +1233,22 @@ emborg with configs:
         expected: test8-\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d
         expected_type: regex
 
+    panther:
+        args: --quiet --config test9 create
+        dependencies: borg1.2
+
+    archivist:
+        args: --quiet --config test9 compact
+        dependencies: borg1.2
+
+    planet:
+        args: --quiet --config test9 prune
+        dependencies: borg1.2
+
+    gable:
+        args: --quiet --config test9 delete
+        dependencies: borg1.2
+
     close:
         # this is needed for the API tests
         args: --quiet --config tests create

diff --git a/tests/test_emborg.py b/tests/test_emborg.py
@@ -1,7 +1,12 @@
-# Tesr Emborg
+# Test Emborg
 #
-# These tests require BorgBackup to be available.  As such, they are not really
-# suitable for public continuous integration services such as GitHub Actions.
+# These tests require BorgBackup to be available.
+# You can set MISSING_DEPENDENCIES environment turn off tests that depend on
+# features you do not have.  Currently there are two such features, “fuse” and
+# “borg1.2”.  Simply list each dependency you do not have in this variable
+# separated by spaces.  For example:
+#
+#     export MISSING_DEPENDENCIES="fuse borg1.2"
 
 # Imports {{{1
 import arrow