diff --git a/oslo_utils/fileutils.py b/oslo_utils/fileutils.py index e2b09173..909ed4b9 100644 --- a/oslo_utils/fileutils.py +++ b/oslo_utils/fileutils.py @@ -25,6 +25,7 @@ import hashlib import os import stat import tempfile +import time from oslo_utils import excutils @@ -123,6 +124,8 @@ def compute_file_checksum(path, read_chunksize=65536, algorithm='sha256'): with open(path, 'rb') as f: for chunk in iter(lambda: f.read(read_chunksize), b''): checksum.update(chunk) + # Release greenthread, if greenthreads are not used it is a noop. + time.sleep(0) return checksum.hexdigest() diff --git a/oslo_utils/tests/test_fileutils.py b/oslo_utils/tests/test_fileutils.py index d34a38b4..7e089c81 100644 --- a/oslo_utils/tests/test_fileutils.py +++ b/oslo_utils/tests/test_fileutils.py @@ -19,6 +19,8 @@ import os import shutil import stat import tempfile +import time +from unittest import mock import uuid from oslotest import base as test_base @@ -215,6 +217,23 @@ class TestComputeFileChecksum(test_base.BaseTestCase): self.assertEqual(expected_checksum.hexdigest(), actual_checksum) + def test_compute_checksum_sleep_0_called(self): + path = fileutils.write_to_tempfile(self.content) + self.assertTrue(os.path.exists(path)) + self.check_file_content(self.content, path) + + expected_checksum = hashlib.sha256() + expected_checksum.update(self.content) + + with mock.patch.object(time, "sleep") as sleep_mock: + actual_checksum = fileutils.compute_file_checksum( + path, read_chunksize=4) + + sleep_mock.assert_has_calls([mock.call(0)] * 3) + # Just to make sure that there were exactly 3 calls + self.assertEqual(3, sleep_mock.call_count) + self.assertEqual(expected_checksum.hexdigest(), actual_checksum) + def test_compute_checksum_named_algorithm(self): path = fileutils.write_to_tempfile(self.content) self.assertTrue(os.path.exists(path))