readding

Author: rtmigo

.gitignore

@@ -1,3 +1,5 @@
+tests/persistence/temp
+
 # Editors
 .vscode/
 .idea/

tests/keeps_value/_cachedir/5a314621d3e0e63d1426fad8eb278455_0/func.txt

@@ -2,11 +2,12 @@
 from pathlib import Path
 from filememo import memoize
 
-cache_path = Path(__file__).parent / "_cachedir"
+cache_path = Path(__file__).parent / "temp" / "cachedir"
 
 
 def increase_value_in_file(basename: str):
-    file = (Path(__file__).parent / basename)
+    file = (Path(__file__).parent / "temp" / basename)
+    file.parent.mkdir(exist_ok=True)
     try:
         t = file.read_text()
     except FileNotFoundError:

tests/keeps_value/_memoized.txt

@@ -57,16 +57,14 @@ def static(a, b):
 
     @classmethod
     @memoize(version=ver)
-    def clmethod(cls, a, b):
+    def class_method(cls, a, b):
         global class_method_calls
         class_method_calls += 1
         return a * b
 
 
 class TestDecorator(unittest.TestCase):
 
-    # test caching BETWEEN program runs
-
     def test_calls_count(self):
         with TemporaryDirectory() as td:
             tempTestDir = Path(td) / "TestDecorator"
@@ -167,8 +165,8 @@ def test_static(self):
 
     def test_class_method(self):
         self.assertEqual(class_method_calls, 0)
-        self.assertEqual(Class.clmethod(2, 3), 6)
-        self.assertEqual(Class.clmethod(2, 3), 6)
+        self.assertEqual(Class.class_method(2, 3), 6)
+        self.assertEqual(Class.class_method(2, 3), 6)
         self.assertEqual(class_method_calls, 1)
 
     def test_noargs(self):
@@ -180,7 +178,7 @@ def test_noargs(self):
     def test_path_as_path(self):
         with TemporaryDirectory() as td:
             @memoize(dir_path=Path(td))  # not string
-            def function(a: int, b: int) -> int:
+            def function(_: int, __: int) -> int:
                 pass
 
             function(1, 1)

tests/keeps_value/_memoized_systemp.txt

@@ -4,8 +4,7 @@
 
 import time
 import unittest
-from datetime import timedelta, datetime
-from pathlib import Path
+from datetime import timedelta
 from tempfile import TemporaryDirectory
 
 from filememo import memoize

tests/keeps_value/_non_memoized.txt

@@ -9,7 +9,10 @@
 from pathlib import Path
 from subprocess import check_call
 
-from .keeps_value.run_me_twice import cache_path
+from .persistence.run_me_in_process import cache_path
+
+output_dir = Path(__file__).parent / "persistence" / "temp"
+module = 'tests.persistence.run_me_in_process'
 
 
 class TestPersist(unittest.TestCase):
@@ -21,7 +24,7 @@ def test_memoized(self):
         if cache_path.exists():
             shutil.rmtree(cache_path)
 
-        f = Path(__file__).parent / "keeps_value" / "_memoized.txt"
+        f = output_dir / "_memoized.txt"
         if f.exists():
             os.remove(f)
 
@@ -31,7 +34,7 @@ def test_memoized(self):
         for _ in range(3):
             check_call((sys.executable,
                         '-m',
-                        'tests.keeps_value.run_me_twice',
+                        module,
                         'memoized'))
 
         self.assertTrue(cache_path.exists())
@@ -44,7 +47,7 @@ def test_non_memoized(self):
         if cache_path.exists():
             shutil.rmtree(cache_path)
 
-        f = Path(__file__).parent / "keeps_value" / "_non_memoized.txt"
+        f = output_dir / "_non_memoized.txt"
         if f.exists():
             os.remove(f)
 
@@ -54,7 +57,7 @@ def test_non_memoized(self):
         for _ in range(3):
             check_call((sys.executable,
                         '-m',
-                        'tests.keeps_value.run_me_twice',
+                        module,
                         'non_memoized'))
 
         self.assertTrue(cache_path.exists())
@@ -65,7 +68,7 @@ def test_systemp(self):
         # the values are cached between calls. In other words, it's not
         # a new temp directory each time
 
-        f = Path(__file__).parent / "keeps_value" / "_memoized_systemp.txt"
+        f = output_dir / "_memoized_systemp.txt"
         if f.exists():
             os.remove(f)
 
@@ -76,11 +79,8 @@ def test_systemp(self):
         for _ in range(3):
             check_call((sys.executable,
                         '-m',
-                        'tests.keeps_value.run_me_twice',
+                        module,
                         'systemp',
-                        str(version)
-                        ))
+                        str(version)))
 
         self.assertEqual(f.read_text(), '1')
-
-        # self.assertLessEqual(int(f.read_text()), 1)