[gentoo-commits] proj/portage:master commit in: lib/portage/tests/util/, lib/portage/util/

[Mike Gilbert]

commit:     cd6a9fa4338a2444c02ece8ff9fb59971a4fe98d
Author:     David Palao <david.palao <AT> gmail <DOT> com>
AuthorDate: Wed May 25 13:29:54 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 23:47:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd6a9fa4

test(mtimedb): added two more UTs about MtimeDB instances creation

Signed-off-by: David Palao <david.palao <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 lib/portage/tests/util/test_mtimedb.py | 23 ++++++++++++++++++++---
 lib/portage/util/mtimedb.py            |  6 ++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/lib/portage/tests/util/test_mtimedb.py 
b/lib/portage/tests/util/test_mtimedb.py
index 6ec009c38..e6ddf5b80 100644
--- a/lib/portage/tests/util/test_mtimedb.py
+++ b/lib/portage/tests/util/test_mtimedb.py
@@ -126,7 +126,7 @@ _PARTIAL_FILE_JSON = b"""{
 }
 """
 
-_TWO_RESUME_LIST_JSON = b"""{
+_TWO_RESUME_LISTS_JSON = b"""{
        "info": {
                "/usr/share/binutils-data/x86_64-pc-linux-gnu/2.34/info": 
1711787325,
                "/usr/share/gcc-data/x86_64-pc-linux-gnu/11.2.0/info": 
1735158257,
@@ -213,12 +213,12 @@ _TWO_RESUME_LIST_JSON = b"""{
 class MtimeDBTestCase(TestCase):
     text = b"Unit tests for MtimeDB"
 
-    def test_has_only_allowed_keys(self):
+    def test_instance_created_with_only_expected_keys(self):
         all_fixtures = (
             _ONE_RESUME_LIST_JSON,
             _EMPTY_FILE,
             _PARTIAL_FILE_JSON,
-            _TWO_RESUME_LIST_JSON,
+            _TWO_RESUME_LISTS_JSON,
         )
         for contents in all_fixtures:
             with patch(
@@ -226,3 +226,20 @@ class MtimeDBTestCase(TestCase):
             ):
                 mtimedb = MtimeDB("/path/to/mtimedb")
             self.assertLessEqual(set(mtimedb.keys()), _MTIMEDBKEYS)
+
+    def test_instance_has_default_values(self):
+        with patch('portage.util.mtimedb.open',
+                   mock_open(read_data=_EMPTY_FILE)):
+            mtimedb = MtimeDB("/some/path/mtimedb")
+        self.assertEqual(mtimedb["starttime"], 0)
+        self.assertEqual(mtimedb["version"], "")
+        self.assertEqual(mtimedb["info"], {})
+        self.assertEqual(mtimedb["ldpath"], {})
+        self.assertEqual(mtimedb["updates"], {})
+
+    def test_instance_has_a_deepcopy_of_clean_data(self):
+        with patch('portage.util.mtimedb.open',
+                   mock_open(read_data=_ONE_RESUME_LIST_JSON)):
+            mtimedb = MtimeDB("/some/path/mtimedb")
+        self.assertEqual(dict(mtimedb), dict(mtimedb._clean_data))
+        self.assertIsNot(mtimedb, mtimedb._clean_data)

diff --git a/lib/portage/util/mtimedb.py b/lib/portage/util/mtimedb.py
index 37afba7c8..3aab0b90b 100644
--- a/lib/portage/util/mtimedb.py
+++ b/lib/portage/util/mtimedb.py
@@ -73,7 +73,8 @@ class MtimeDB(dict):
             try:
                 d = json.loads(
                     _unicode_decode(
-                        content, encoding=_encodings["repo.content"], 
errors="strict"
+                        content, encoding=_encodings["repo.content"],
+                        errors="strict"
                     )
                 )
             except SystemExit:
@@ -91,7 +92,8 @@ class MtimeDB(dict):
                     raise
                 except Exception:
                     writemsg(
-                        _(f"!!! Error loading '{filename}': {e}\n"), 
noiselevel=-1
+                        _(f"!!! Error loading '{filename}': {e}\n"),
+                        noiselevel=-1
                     )
 
         if "old" in d: