Merge hot fix from 'usnistgov/integration' into rel/1.3.X (LockedFile

close bug)
usnistgov · Apr 15, 2020 · 26af041 · 26af041
2 parents f7179a8 + 06b2ec3
commit 26af041
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/python/nistoar/pdr/utils.py b/python/nistoar/pdr/utils.py
@@ -161,6 +161,7 @@ def __enter__(self):
         return self.open()
 
     def __exit__(self, e1, e2, e3):
+        self.close()
         return False
 
     def __del__(self):

diff --git a/python/tests/nistoar/pdr/test_utils.py b/python/tests/nistoar/pdr/test_utils.py
@@ -150,10 +150,14 @@ def run(self):
                 self.f('o')
 
     def lockedop(self, who, mode='r', sleep=0.5):
-        with utils.LockedFile(self.lfile, mode) as lockdfile:
+        lf = utils.LockedFile(self.lfile, mode)
+        self.assertIsNone(lf.fo)
+        with lf as lockdfile:
+            self.assertIsNotNone(lf.fo)
             self.rfd.write(who+'a')
             time.sleep(sleep)
             self.rfd.write(who+'r')
+        self.assertIsNone(lf.fo)
 
     def setUp(self):
         self.tf = Tempfiles()