etorres/rbackup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing tests

Browse Source
This commit is contained in:
Eric Torres 2019-04-18 21:44:03 -07:00
parent 07d9f165ee
commit 250ce3d945
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test_repository.py
View File

@ -6,7 +6,7 @@ Tests for the rbackup.struct.repository module.
import re import re
import unittest import unittest
from pathlib import Path from pathlib import Path
from unittest.mock import DEFAULT, patch from unittest.mock import DEFAULT, PropertyMock, patch
from hypothesis import given from hypothesis import given
from hypothesis.strategies import from_regex, lists, text from hypothesis.strategies import from_regex, lists, text
@ -19,7 +19,7 @@ TESTING_PACKAGE = "rbackup.struct"
TESTING_MODULE = f"{TESTING_PACKAGE}.repository" TESTING_MODULE = f"{TESTING_PACKAGE}.repository"
SS_MODULE = f"{TESTING_PACKAGE}.snapshot" SS_MODULE = f"{TESTING_PACKAGE}.snapshot"
VALID_SNAPSHOT_NAME = r"[\w._+-]+[^/]*" VALID_SNAPSHOT_NAME = r"[\w._@:+-]+[^/]*"
# ========== Integration Tests ========== # ========== Integration Tests ==========
@ -182,7 +182,6 @@ class TestRepositoryPostCreate(unittest.TestCase):
patch.stopall() patch.stopall()
@unittest.skip("Fix call checks")
class TestRepositoryCleanup(unittest.TestCase): class TestRepositoryCleanup(unittest.TestCase):
"""Test that repository cleanup works properly. """Test that repository cleanup works properly.
@ -219,7 +218,7 @@ class TestRepositoryCleanup(unittest.TestCase):
self.mocked_shutil["rmtree"].avoids_symlink_attacks = True self.mocked_shutil["rmtree"].avoids_symlink_attacks = True
def test_stops_on_non_symlink_resistant(self): def test_stops_on_non_symlink_resistant(self):
self.mocked_shutil["rmtree"].avoids_symlink_attacks = True self.mocked_shutil["rmtree"].avoids_symlink_attacks = False
repo = Repository("/tmp/backup") repo = Repository("/tmp/backup")
repo.cleanup(remove_snapshots=True) repo.cleanup(remove_snapshots=True)
@ -227,26 +226,31 @@ class TestRepositoryCleanup(unittest.TestCase):
self.mocked_path["unlink"].assert_not_called() self.mocked_path["unlink"].assert_not_called()
self.mocked_shutil["rmtree"].assert_not_called() self.mocked_shutil["rmtree"].assert_not_called()
def test_removes_metadata_by_default(self): @patch.object(Repository, "snapshot_symlink", new_callable=PropertyMock)
@patch.object(Repository, "metadata_path", new_callable=PropertyMock)
def test_removes_metadata_by_default(
self, mocked_metadata_path, mocked_snapshot_symlink
):
repo = Repository("/tmp/backup") repo = Repository("/tmp/backup")
repo.cleanup() repo.cleanup()
self.mocked_path["unlink"].assert_called_once() mocked_metadata_path.return_value.unlink.assert_called_once()
mocked_snapshot_symlink.return_value.unlink.assert_called_once()
def test_removes_snapshots(self): def test_removes_snapshots(self):
repo = Repository("/tmp/backup") repo = Repository("/tmp/backup")
repo.cleanup(remove_snapshots=True) repo.cleanup(remove_snapshots=True)
self.mocked_shutil.rmtree.assert_called_once() self.mocked_shutil["rmtree"].assert_called_once()
def test_removes_repo_dir(self): def test_removes_repo_dir(self):
repo = Repository("/tmp/backup") repo = Repository("/tmp/backup")
repo.cleanup(remove_repo_dir=True) repo.cleanup(remove_repo_dir=True)
self.mocked_shutil.rmtree.assert_called_once() self.mocked_shutil["rmtree"].assert_called_once()
def tearDown(self): def tearDown(self):
patch.stopall() patch.stopall()