tests: cleanup afterwards

nanite/read/read_jpk_meta.py

@@ -1,7 +1,7 @@
-"""Methods to open JPK data files and to obtain meta data.
-"""
+"""Methods to open JPK data files and to obtain meta data"""
 import functools
 import pathlib
+import shutil
 import tempfile
 import zipfile
 
@@ -14,8 +14,7 @@ class ReadJPKMetaKeyError(BaseException):
 
 
 def extract_jpk(path_jpk, props_only=False):
-    """ Extract the JPK data files and return the extracted path.
-    """
+    """Extract the JPK data files and return the extracted path"""
     tdir = tempfile.mkdtemp(prefix="nanite_jpk_")
     with zipfile.ZipFile(str(path_jpk)) as fd:
         if props_only:
@@ -123,6 +122,8 @@ def get_meta_data(jpk_file):
     # join curve types
     md["curve type"] = "-".join(md["curve type"])
     md["file"] = jpk_file
+    # cleanup
+    shutil.rmtree(tdir, ignore_errors=True)
     return md
 
 

tests/test_dataset.py → tests/test_group.py

@@ -1,4 +1,4 @@
-"""Test of data set functionalities"""
+"""Test group functionalities"""
 import pathlib
 
 from nanite import Indentation, IndentationGroup
@@ -8,7 +8,7 @@
 jpkfile = datadir / "spot3-0192.jpk-force"
 
 
-def test_afm_data_set():
+def test_base():
     ds1 = IndentationGroup(jpkfile)
     ds2 = IndentationGroup(jpkfile)
 

tests/test_jproperties.py

@@ -1,5 +1,6 @@
 """Test of basic opening functionalities"""
 import pathlib
+import shutil
 
 from nanite.read import read_jpk_meta
 
@@ -13,6 +14,7 @@ def test_meta_simple():
     tdir = read_jpk_meta.extract_jpk(jpkfilemap)
     hpfile = tdir / "index/0/segments/0/segment-header.properties"
     read_jpk_meta.get_seg_head_prop(hpfile)
+    shutil.rmtree(tdir, ignore_errors=True)
 
 
 def test_mata_single():

tests/test_open_jpk.py

@@ -19,7 +19,7 @@ def test_open_jpk_simple():
         key = ch.stem
         chan_data[key] = read_jpk.load_dat_raw(ch)
     assert chan_data["height"][0] == 50.425720226584403
-    shutil.rmtree(str(tdir))
+    shutil.rmtree(tdir, ignore_errors=True)
 
 
 def test_open_jpk_callibration():
@@ -47,7 +47,7 @@ def test_open_jpk_conversion():
     assert chan_data["vDeflection"][0][0] == -5.145579192349918e-10
     assert chan_data["height"][0][0] == 2.8783223430683289e-05
     assert chan_data["strainGaugeHeight"][0][0] == 2.2815672438768612e-05
-    shutil.rmtree(str(tdir))
+    shutil.rmtree(tdir, ignore_errors=True)
 
 
 def test_get_single_curves():

tests/test_open_jpk_map.py

@@ -3,14 +3,13 @@
 
 import numpy as np
 
-from nanite.read import read_jpk, read_jpk_meta
+from nanite.read import read_jpk
 
 datadir = pathlib.Path(__file__).resolve().parent / "data"
 
 
 def test_open_jpk_map():
     jpkfile = datadir / "map0d_extracted.jpk-force-map"
-    read_jpk_meta.get_meta_data(jpkfile)
     data = read_jpk.load_jpk(jpkfile)
     force = data[0][0][0]["force"]
     height = data[0][0][0]["height (measured)"]
@@ -21,7 +20,6 @@ def test_open_jpk_map():
 
 def test_open_jpk_map2():
     jpkfile = datadir / "map2x2_extracted.jpk-force-map"
-    read_jpk_meta.get_meta_data(jpkfile)
     data = read_jpk.load_jpk(jpkfile)
     force = data[2][0][0]["force"]
     height = data[2][0][0]["height (measured)"]