third-party-mirrors/zfs_autobackup
1
0
Fork 1
mirror of https://github.com/psy0rz/zfs_autobackup.git synced 2025-06-05 01:33:00 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Edwin Eefting 2024-10-08 17:08:55 +02:00
parent d97a5f9527
commit d79d6af548
No known key found for this signature in database
GPG Key ID: 0F3C35D8E9887737
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/test_externalfailures.py
View File

@ -10,7 +10,6 @@ class TestExternalFailures(unittest2.TestCase):
# generate a resumable state # generate a resumable state
# NOTE: this generates two resumable test_target1/test_source1/fs1 and test_target1/test_source1/fs1/sub # NOTE: this generates two resumable test_target1/test_source1/fs1 and test_target1/test_source1/fs1/sub
def generate_resume(self): def generate_resume(self):
r = shelltest("zfs set compress=off test_source1 test_target1") r = shelltest("zfs set compress=off test_source1 test_target1")
# big change on source # big change on source
@ -30,7 +29,6 @@ class TestExternalFailures(unittest2.TestCase):
# resume initial backup # resume initial backup
def test_initial_resume(self): def test_initial_resume(self):
# inital backup, leaves resume token # inital backup, leaves resume token
with mocktime("20101111000000"): with mocktime("20101111000000"):
self.generate_resume() self.generate_resume()
@ -69,7 +67,6 @@ test_target1/test_source2/fs2/sub@test-20101111000000
# resume incremental backup # resume incremental backup
def test_incremental_resume(self): def test_incremental_resume(self):
# initial backup # initial backup
with mocktime("20101111000000"): with mocktime("20101111000000"):
self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run()) self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run())
@ -114,8 +111,6 @@ test_target1/test_source2/fs2/sub@test-20101111000000
# generate an invalid resume token, and verify if its aborted automaticly # generate an invalid resume token, and verify if its aborted automaticly
def test_initial_resumeabort(self): def test_initial_resumeabort(self):
# inital backup, leaves resume token # inital backup, leaves resume token
with mocktime("20101111000000"): with mocktime("20101111000000"):
self.generate_resume() self.generate_resume()
@ -150,7 +145,6 @@ test_target1/test_source2/fs2/sub@test-20101111000000
# generate an invalid resume token, and verify if its aborted automaticly # generate an invalid resume token, and verify if its aborted automaticly
def test_incremental_resumeabort(self): def test_incremental_resumeabort(self):
# initial backup # initial backup
with mocktime("20101111000000"): with mocktime("20101111000000"):
self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run()) self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run())
@ -187,7 +181,6 @@ test_target1/test_source2/fs2/sub@test-20101111000000
# create a resume situation, where the other side doesnt want the snapshot anymore ( should abort resume ) # create a resume situation, where the other side doesnt want the snapshot anymore ( should abort resume )
def test_abort_unwanted_resume(self): def test_abort_unwanted_resume(self):
with mocktime("20101111000000"): with mocktime("20101111000000"):
self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose".split(" ")).run()) self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose".split(" ")).run())
@ -200,7 +193,8 @@ test_target1/test_source2/fs2/sub@test-20101111000000
# incremental, doesnt want previous anymore # incremental, doesnt want previous anymore
with mocktime("20101111000002"): with mocktime("20101111000002"):
self.assertFalse(ZfsAutobackup( self.assertFalse(ZfsAutobackup(
"test test_target1 --no-progress --verbose --keep-target=0 --allow-empty --debug".split(" ")).run()) "test test_target1 --no-progress --verbose --keep-target=0 --allow-empty --debug".split(
" ")).run())
print(buf.getvalue()) print(buf.getvalue())
@ -222,7 +216,6 @@ test_target1/test_source2/fs2/sub@test-20101111000002
# test with empty snapshot list (this was a bug) # test with empty snapshot list (this was a bug)
def test_abort_resume_emptysnapshotlist(self): def test_abort_resume_emptysnapshotlist(self):
with mocktime("20101111000000"): with mocktime("20101111000000"):
self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose".split(" ")).run()) self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose".split(" ")).run())
@ -240,15 +233,14 @@ test_target1/test_source2/fs2/sub@test-20101111000002
"test test_target1 --no-progress --verbose --no-snapshot".split( "test test_target1 --no-progress --verbose --no-snapshot".split(
" ")).run()) " ")).run())
#NOTE: v3.4 doesnt abort the resume if there are no snapshots to send. # NOTE: v3.4 doesnt abort the resume if there are no snapshots to send.
# print(buf.getvalue()) # print(buf.getvalue())
# self.assertIn("Aborting resume, its obsolete", buf.getvalue()) # self.assertIn("Aborting resume, its obsolete", buf.getvalue())
def test_missing_common(self): def test_missing_common(self):
with mocktime("20101111000000"): with mocktime("20101111000000"):
self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run()) self.assertFalse(ZfsAutobackup(
"test test_target1 --no-progress --verbose --allow-empty --no-bookmarks".split(" ")).run())
# remove common snapshot and leave nothing # remove common snapshot and leave nothing
shelltest("zfs release zfs_autobackup:test test_source1/fs1@test-20101111000000") shelltest("zfs release zfs_autobackup:test test_source1/fs1@test-20101111000000")
@ -257,10 +249,9 @@ test_target1/test_source2/fs2/sub@test-20101111000002
with mocktime("20101111000001"): with mocktime("20101111000001"):
self.assertTrue(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run()) self.assertTrue(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run())
#UPDATE: offcourse the one thing that wasn't tested had a bug :( (in ExecuteNode.run()). # UPDATE: offcourse the one thing that wasn't tested had a bug :( (in ExecuteNode.run()).
def test_ignoretransfererrors(self): def test_ignoretransfererrors(self):
self.skipTest("Not sure how to implement a test for this without some serious hacking and patching.")
self.skipTest("Not sure how to implement a test for this without some serious hacking and patching.")
# #recreate target pool without any features # #recreate target pool without any features
# # shelltest("zfs set compress=on test_source1; zpool destroy test_target1; zpool create test_target1 -o feature@project_quota=disabled /dev/ram2") # # shelltest("zfs set compress=on test_source1; zpool destroy test_target1; zpool create test_target1 -o feature@project_quota=disabled /dev/ram2")

11
tests/test_regressions.py
View File

@ -1,4 +1,3 @@
from basetest import * from basetest import *
@ -6,7 +5,7 @@ class TestZfsNode(unittest2.TestCase):
def setUp(self): def setUp(self):
prepare_zpools() prepare_zpools()
self.longMessage=True self.longMessage = True
def test_keepsource0target10queuedsend(self): def test_keepsource0target10queuedsend(self):
"""Test if thinner doesnt destroy too much early on if there are no common snapshots YET. Issue #84""" """Test if thinner doesnt destroy too much early on if there are no common snapshots YET. Issue #84"""
@ -26,7 +25,7 @@ class TestZfsNode(unittest2.TestCase):
"test test_target1 --no-progress --verbose --keep-source=0 --keep-target=10 --allow-empty".split( "test test_target1 --no-progress --verbose --keep-source=0 --keep-target=10 --allow-empty".split(
" ")).run()) " ")).run())
r = shelltest("zfs list -H -o name -r -t all " + TEST_POOLS) r = shelltest("zfs list -H -o name -r -t bookmark,filesystem " + TEST_POOLS)
self.assertMultiLineEqual(r, """ self.assertMultiLineEqual(r, """
test_source1 test_source1
test_source1/fs1 test_source1/fs1
@ -57,7 +56,6 @@ test_target1/test_source2/fs2/sub@test-20101111000001
test_target1/test_source2/fs2/sub@test-20101111000002 test_target1/test_source2/fs2/sub@test-20101111000002
""") """)
def test_excludepaths(self): def test_excludepaths(self):
"""Test issue #103""" """Test issue #103"""
@ -70,8 +68,7 @@ test_target1/test_source2/fs2/sub@test-20101111000002
"test test_target1/target --no-progress --verbose --allow-empty".split( "test test_target1/target --no-progress --verbose --allow-empty".split(
" ")).run()) " ")).run())
r = shelltest("zfs list -H -o name -r -t snapshot,filesystem " + TEST_POOLS)
r = shelltest("zfs list -H -o name -r -t all " + TEST_POOLS)
self.assertMultiLineEqual(r, """ self.assertMultiLineEqual(r, """
test_source1 test_source1
test_source1/fs1 test_source1/fs1
@ -101,5 +98,3 @@ test_target1/target/test_target1/target_shouldnotbeexcluded@test-20101111000000
test_target1/target_shouldnotbeexcluded test_target1/target_shouldnotbeexcluded
test_target1/target_shouldnotbeexcluded@test-20101111000000 test_target1/target_shouldnotbeexcluded@test-20101111000000
""") """)

12
tests/test_zfsautobackup34.py
View File

@ -264,3 +264,15 @@ test_target1/b/test_source2/fs2/sub@test-20101111000001_tagA
test_target1/b/test_source2/fs2/sub@test-20101111000002_tagB test_target1/b/test_source2/fs2/sub@test-20101111000002_tagB
test_target1/b/test_source2/fs2/sub@test-20101111000003 test_target1/b/test_source2/fs2/sub@test-20101111000003
""") """)
def test_missing_common_bookmark(self):
with mocktime("20101111000000"):
self.assertFalse(ZfsAutobackup(
"test test_target1 --no-progress --verbose --allow-empty --no-holds".split(" ")).run())
# remove common bookmark
bookmark = shelltest("zfs list -H -o name -t bookmark test_source1/fs1").strip()
shelltest("zfs destroy " + bookmark)
with mocktime("20101111000001"):
self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --allow-empty".split(" ")).run())