archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Moving blobs between nodes now uses storage API

Browse Source 
Instead of only being GCS-specific, it now works for all storage
backends.
This commit is contained in:
Sybren A. Stüvel
2018-02-13 15:34:05 +01:00
parent eb18e5b933
commit cd42ce6cba
5 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/test_api/test_nodes_moving.py
View File

@@ -106,11 +106,11 @@ class NodeMoverTest(unittest.TestCase):
self.db['nodes'].update_one.return_value = update_res
self.mover.change_project(node, new_project)
mock_fsmoving.gcs_move_to_bucket.assert_has_calls([
mock.call(ObjectId(24 * 'b'), prid, skip_gcs=False),
mock.call(ObjectId(24 * 'e'), prid, skip_gcs=False),
mock.call(ObjectId(24 * 'c'), prid, skip_gcs=False),
mock.call(ObjectId(24 * 'd'), prid, skip_gcs=False),
mock_fsmoving.move_to_bucket.assert_has_calls([
mock.call(ObjectId(24 * 'b'), prid, skip_storage=False),
mock.call(ObjectId(24 * 'e'), prid, skip_storage=False),
mock.call(ObjectId(24 * 'c'), prid, skip_storage=False),
mock.call(ObjectId(24 * 'd'), prid, skip_storage=False),
])
@mock.patch('pillar.api.file_storage.moving', autospec=True)
@@ -135,7 +135,7 @@ class NodeMoverTest(unittest.TestCase):
self.db['nodes'].update_one.return_value = update_res
self.mover.change_project(node, new_project)
mock_fsmoving.gcs_move_to_bucket.assert_has_calls([
mock.call(ObjectId(24 * 'e'), prid, skip_gcs=False),
mock.call(ObjectId(24 * 'b'), prid, skip_gcs=False),
mock_fsmoving.move_to_bucket.assert_has_calls([
mock.call(ObjectId(24 * 'e'), prid, skip_storage=False),
mock.call(ObjectId(24 * 'b'), prid, skip_storage=False),
])