openstack
/
deb-python-shotgun
Code Issues Proposed changes

Check /var/dump existence 

Before removing contents of /var/dump the shotgun now checks that the
directory exists.

Change-Id: Ie503a17144452dcab97b31a4dd4dd5bfa2a4c46b
Closes-Bug: #1574695
This commit is contained in:
georgy 2016-06-17 10:54:12 +03:00 committed by georgy
parent 8fc566b822
commit 43b5d6d905
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shotgun/manager.py
View File

@ -83,5 +83,6 @@ class Manager(object):
msg = "Clearing target failed. function: {}, path: {}, excinfo: {}"
logger.error(msg.format(function, path, excinfo))
shutil.rmtree(os.path.dirname(self.conf.target),
onerror=on_rmtree_error)
if os.path.exists(self.conf.target):
shutil.rmtree(os.path.dirname(self.conf.target),
onerror=on_rmtree_error)

17
shotgun/test/test_manager.py
View File

@ -27,8 +27,7 @@ class TestManager(base.BaseTestCase):
@mock.patch('shotgun.manager.Driver.getDriver')
@mock.patch('shotgun.manager.utils.compress')
@mock.patch('shutil.rmtree')
def test_snapshot(self, mrmtree, mcompress, mget):
def test_snapshot(self, mcompress, mget):
data = {
"type": "file",
"path": "/remote_dir/remote_file",
@ -45,12 +44,10 @@ class TestManager(base.BaseTestCase):
manager.snapshot()
calls = [mock.call(data, conf), mock.call(conf.self_log_object, conf)]
mget.assert_has_calls(calls, any_order=True)
mrmtree.assert_called_once_with('/target', onerror=mock.ANY)
@mock.patch('shotgun.manager.Driver.getDriver')
@mock.patch('shutil.rmtree')
@mock.patch('shotgun.manager.utils.compress')
def test_snapshot_network_error(self, mcompress, mrmtree, mget):
def test_snapshot_network_error(self, mcompress, mget):
objs = [
{"type": "file",
"path": "/remote_file1",
@ -92,7 +89,6 @@ class TestManager(base.BaseTestCase):
mock.call(processed_obj, conf),
mock.call(offline_obj, conf),
mock.call(offline_obj, conf)], any_order=True)
mrmtree.assert_called_once_with('/tmp', onerror=mock.ANY)
@mock.patch('shotgun.manager.Manager.action_single')
def test_report(self, mock_action):
@ -134,8 +130,7 @@ class TestManager(base.BaseTestCase):
self.assertFalse(mock_driver_instance.report.called)
@mock.patch('shotgun.manager.Manager.action_single')
@mock.patch('shutil.rmtree')
def test_snapshot_rm_without_disk_space(self, mrmtree, mock_action):
def test_snapshot_rm_without_disk_space(self, mock_action):
mock_action.side_effect = IOError(28, "Not enough space")
data = {
@ -153,12 +148,9 @@ class TestManager(base.BaseTestCase):
manager = Manager(conf)
self.assertRaises(IOError, manager.snapshot)
calls = [mock.call('/target', onerror=mock.ANY) for _ in range(2)]
mrmtree.assert_has_calls(calls)
@mock.patch('shotgun.manager.Manager.action_single')
@mock.patch('shutil.rmtree')
def test_snapshot_doesnt_clean_on_generic_ioerror(self, mrmtree,
def test_snapshot_doesnt_clean_on_generic_ioerror(self,
mock_action):
mock_action.side_effect = IOError(1, "Generic error")
@ -177,4 +169,3 @@ class TestManager(base.BaseTestCase):
manager = Manager(conf)
self.assertRaises(IOError, manager.snapshot)
mrmtree.assert_called_once_with('/target', onerror=mock.ANY)