| 1 |
commit: 4540f2b0a6529705343f493abb478370c15f101f |
| 2 |
Author: David Palao <david.palao <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 30 07:00:32 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 7 23:47:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4540f2b0 |
| 7 |
|
| 8 |
improvement(mtimedb): class has better API |
| 9 |
|
| 10 |
New attribute ``is_readonly`` and new method ``make_readonly`` added. |
| 11 |
|
| 12 |
Signed-off-by: David Palao <david.palao <AT> gmail.com> |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
lib/portage/tests/util/test_mtimedb.py | 28 +++++++++++++++++++++++++--- |
| 16 |
lib/portage/util/mtimedb.py | 10 ++++++++++ |
| 17 |
2 files changed, 35 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/lib/portage/tests/util/test_mtimedb.py b/lib/portage/tests/util/test_mtimedb.py |
| 20 |
index a65a6be91..ecc0e7135 100644 |
| 21 |
--- a/lib/portage/tests/util/test_mtimedb.py |
| 22 |
+++ b/lib/portage/tests/util/test_mtimedb.py |
| 23 |
@@ -9,6 +9,8 @@ from portage.util.mtimedb import MtimeDB, _MTIMEDBKEYS |
| 24 |
from portage.exception import DigestException |
| 25 |
|
| 26 |
|
| 27 |
+# Some random data for the fixtures: |
| 28 |
+ |
| 29 |
_ONE_RESUME_LIST_JSON = b"""{ |
| 30 |
"info": { |
| 31 |
"/tmp/stage1root/usr/share/binutils-data/x86_64-pc-linux-gnu/2.34/info": 1711785090, |
| 32 |
@@ -213,7 +215,7 @@ _TWO_RESUME_LISTS_JSON = b"""{ |
| 33 |
class MtimeDBTestCase(TestCase): |
| 34 |
text = b"Unit tests for MtimeDB" |
| 35 |
|
| 36 |
- def test_instance_created_with_only_expected_keys(self): |
| 37 |
+ def test_instances_are_created_with_only_expected_keys(self): |
| 38 |
all_fixtures = ( |
| 39 |
_ONE_RESUME_LIST_JSON, |
| 40 |
_EMPTY_FILE, |
| 41 |
@@ -227,7 +229,7 @@ class MtimeDBTestCase(TestCase): |
| 42 |
mtimedb = MtimeDB("/path/to/mtimedb") |
| 43 |
self.assertLessEqual(set(mtimedb.keys()), _MTIMEDBKEYS) |
| 44 |
|
| 45 |
- def test_instance_has_default_values(self): |
| 46 |
+ def test_instances_have_default_values(self): |
| 47 |
with patch("portage.util.mtimedb.open", |
| 48 |
mock_open(read_data=_EMPTY_FILE)): |
| 49 |
mtimedb = MtimeDB("/some/path/mtimedb") |
| 50 |
@@ -237,7 +239,7 @@ class MtimeDBTestCase(TestCase): |
| 51 |
self.assertEqual(mtimedb["ldpath"], {}) |
| 52 |
self.assertEqual(mtimedb["updates"], {}) |
| 53 |
|
| 54 |
- def test_instance_has_a_deepcopy_of_clean_data(self): |
| 55 |
+ def test_instances_keep_a_deepcopy_of_clean_data(self): |
| 56 |
with patch("portage.util.mtimedb.open", |
| 57 |
mock_open(read_data=_ONE_RESUME_LIST_JSON)): |
| 58 |
mtimedb = MtimeDB("/some/path/mtimedb") |
| 59 |
@@ -274,3 +276,23 @@ class MtimeDBTestCase(TestCase): |
| 60 |
mtimedb = MtimeDB("/some/path/mtimedb") |
| 61 |
mtimedb.commit() |
| 62 |
pwrite2disk.assert_not_called() |
| 63 |
+ |
| 64 |
+ def test_is_readonly_attribute(self): |
| 65 |
+ with patch("portage.util.mtimedb.open", |
| 66 |
+ mock_open(read_data=_ONE_RESUME_LIST_JSON)): |
| 67 |
+ mtimedb = MtimeDB("/some/path/mtimedb") |
| 68 |
+ self.assertFalse(mtimedb.is_readonly) |
| 69 |
+ |
| 70 |
+ mtimedb.filename = None |
| 71 |
+ self.assertTrue(mtimedb.is_readonly) |
| 72 |
+ |
| 73 |
+ mtimedb.filename = "/what/ever/mtimedb" |
| 74 |
+ self.assertFalse(mtimedb.is_readonly) |
| 75 |
+ |
| 76 |
+ def test_make_readonly(self): |
| 77 |
+ with patch("portage.util.mtimedb.open", |
| 78 |
+ mock_open(read_data=_ONE_RESUME_LIST_JSON)): |
| 79 |
+ mtimedb = MtimeDB("/some/path/mtimedb") |
| 80 |
+ mtimedb.make_readonly() |
| 81 |
+ self.assertTrue(mtimedb.is_readonly) |
| 82 |
+ self.assertIs(mtimedb.filename, None) |
| 83 |
|
| 84 |
diff --git a/lib/portage/util/mtimedb.py b/lib/portage/util/mtimedb.py |
| 85 |
index a6566e3f8..95da2235f 100644 |
| 86 |
--- a/lib/portage/util/mtimedb.py |
| 87 |
+++ b/lib/portage/util/mtimedb.py |
| 88 |
@@ -51,6 +51,16 @@ class MtimeDB(dict): |
| 89 |
self.filename = filename |
| 90 |
self._load(filename) |
| 91 |
|
| 92 |
+ @property |
| 93 |
+ def is_readonly(self): |
| 94 |
+ if self.filename is None: |
| 95 |
+ return True |
| 96 |
+ else: |
| 97 |
+ return False |
| 98 |
+ |
| 99 |
+ def make_readonly(self): |
| 100 |
+ self.filename = None |
| 101 |
+ |
| 102 |
def _load(self, filename): |
| 103 |
f = None |
| 104 |
content = None |
Archives