From 76f07e4c1e0210ca2f0a5410b0eb8d1e80275d05 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 29 Sep 2020 19:25:50 +0200 Subject: [PATCH] tmp_path is preferred over tmpdir --- python/tests/test_Colormap.py | 18 ++++++++-------- python/tests/test_Geom.py | 40 +++++++++++++++++------------------ python/tests/test_Table.py | 24 ++++++++++----------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/python/tests/test_Colormap.py b/python/tests/test_Colormap.py index 7f12469f8..71d896016 100644 --- a/python/tests/test_Colormap.py +++ b/python/tests/test_Colormap.py @@ -77,17 +77,17 @@ class TestColormap: @pytest.mark.parametrize('format',['ASCII','paraview','GOM','gmsh']) @pytest.mark.parametrize('model',['rgb','hsv','hsl','xyz','lab','msh']) - def test_from_range(self,model,format,tmpdir): + def test_from_range(self,model,format,tmp_path): N = np.random.randint(2,256) c = Colormap.from_range(np.random.rand(3),np.random.rand(3),model=model,N=N) # noqa - eval(f'c.save_{format}(tmpdir/"color_out")') + eval(f'c.save_{format}(tmp_path/"color_out")') @pytest.mark.parametrize('format',['ASCII','paraview','GOM','gmsh']) @pytest.mark.parametrize('name',['strain','gnuplot','Greys','PRGn','viridis']) - def test_from_predefined(self,name,format,tmpdir): + def test_from_predefined(self,name,format,tmp_path): N = np.random.randint(2,256) c = Colormap.from_predefined(name,N) # noqa - os.chdir(tmpdir) + os.chdir(tmp_path) eval(f'c.save_{format}()') @pytest.mark.parametrize('format,name',[('ASCII','test.txt'), @@ -95,9 +95,9 @@ class TestColormap: ('GOM','test.legend'), ('gmsh','test.msh') ]) - def test_write_filehandle(self,format,name,tmpdir): + def test_write_filehandle(self,format,name,tmp_path): c = Colormap.from_predefined('Dark2') # noqa - fname = tmpdir/name + fname = tmp_path/name with open(fname,'w') as f: # noqa eval(f'c.save_{format}(f)') for i in range(10): @@ -146,14 +146,14 @@ class TestColormap: ('GOM','.legend'), ('gmsh','.msh') ]) - def test_compare_reference(self,format,ext,tmpdir,reference_dir,update): + def test_compare_reference(self,format,ext,tmp_path,reference_dir,update): name = 'binary' c = Colormap.from_predefined(name) # noqa if update: os.chdir(reference_dir) eval(f'c.save_{format}()') else: - os.chdir(tmpdir) + os.chdir(tmp_path) eval(f'c.save_{format}()') time.sleep(.5) - assert filecmp.cmp(tmpdir/(name+ext),reference_dir/(name+ext)) + assert filecmp.cmp(tmp_path/(name+ext),reference_dir/(name+ext)) diff --git a/python/tests/test_Geom.py b/python/tests/test_Geom.py index 9aff60186..21eb38cdd 100644 --- a/python/tests/test_Geom.py +++ b/python/tests/test_Geom.py @@ -42,46 +42,46 @@ class TestGeom: assert str(default.diff(new)) != '' - def test_write_read_str(self,default,tmpdir): - default.save_ASCII(str(tmpdir/'default.geom')) - new = Geom.load_ASCII(str(tmpdir/'default.geom')) + def test_write_read_str(self,default,tmp_path): + default.save_ASCII(str(tmp_path/'default.geom')) + new = Geom.load_ASCII(str(tmp_path/'default.geom')) assert geom_equal(default,new) - def test_write_read_file(self,default,tmpdir): - with open(tmpdir/'default.geom','w') as f: + def test_write_read_file(self,default,tmp_path): + with open(tmp_path/'default.geom','w') as f: default.save_ASCII(f,compress=True) - with open(tmpdir/'default.geom') as f: + with open(tmp_path/'default.geom') as f: new = Geom.load_ASCII(f) assert geom_equal(default,new) - def test_read_write_vtr(self,default,tmpdir): - default.save(tmpdir/'default') + def test_read_write_vtr(self,default,tmp_path): + default.save(tmp_path/'default') for _ in range(10): time.sleep(.2) - if os.path.exists(tmpdir/'default.vtr'): break + if os.path.exists(tmp_path/'default.vtr'): break - new = Geom.load(tmpdir/'default.vtr') + new = Geom.load(tmp_path/'default.vtr') assert geom_equal(new,default) - def test_invalid_geom(self,tmpdir): - with open('invalid_file','w') as f: + def test_invalid_geom(self,tmp_path): + with open(tmp_path/'invalid_file','w') as f: f.write('this is not a valid header') - with open('invalid_file','r') as f: + with open(tmp_path/'invalid_file','r') as f: with pytest.raises(TypeError): Geom.load_ASCII(f) - def test_invalid_vtr(self,tmpdir): + def test_invalid_vtr(self,tmp_path): v = VTK.from_rectilinearGrid(np.random.randint(5,10,3)*2,np.random.random(3) + 1.0) - v.save(tmpdir/'no_materialpoint.vtr') + v.save(tmp_path/'no_materialpoint.vtr') for _ in range(10): time.sleep(.2) - if os.path.exists(tmpdir/'no_materialpoint.vtr'): break + if os.path.exists(tmp_path/'no_materialpoint.vtr'): break with pytest.raises(ValueError): - Geom.load(tmpdir/'no_materialpoint.vtr') + Geom.load(tmp_path/'no_materialpoint.vtr') def test_invalid_material(self): with pytest.raises(TypeError): @@ -92,9 +92,9 @@ class TestGeom: assert g.material.dtype in np.sctypes['int'] @pytest.mark.parametrize('compress',[True,False]) - def test_compress(self,default,tmpdir,compress): - default.save_ASCII(tmpdir/'default.geom',compress=compress) - new = Geom.load_ASCII(tmpdir/'default.geom') + def test_compress(self,default,tmp_path,compress): + default.save_ASCII(tmp_path/'default.geom',compress=compress) + new = Geom.load_ASCII(tmp_path/'default.geom') assert geom_equal(new,default) diff --git a/python/tests/test_Table.py b/python/tests/test_Table.py index 7a86c7fed..9dad681bd 100644 --- a/python/tests/test_Table.py +++ b/python/tests/test_Table.py @@ -34,31 +34,31 @@ class TestTable: assert np.allclose(d,1.0) and d.shape[1:] == (1,) @pytest.mark.parametrize('mode',['str','path']) - def test_write_read(self,default,tmpdir,mode): - default.save(tmpdir/'default.txt') + def test_write_read(self,default,tmp_path,mode): + default.save(tmp_path/'default.txt') if mode == 'path': - new = Table.load(tmpdir/'default.txt') + new = Table.load(tmp_path/'default.txt') elif mode == 'str': - new = Table.load(str(tmpdir/'default.txt')) + new = Table.load(str(tmp_path/'default.txt')) assert all(default.data==new.data) and default.shapes == new.shapes - def test_write_read_file(self,default,tmpdir): - with open(tmpdir/'default.txt','w') as f: + def test_write_read_file(self,default,tmp_path): + with open(tmp_path/'default.txt','w') as f: default.save(f) - with open(tmpdir/'default.txt') as f: + with open(tmp_path/'default.txt') as f: new = Table.load(f) assert all(default.data==new.data) and default.shapes == new.shapes - def test_write_read_legacy_style(self,default,tmpdir): - with open(tmpdir/'legacy.txt','w') as f: + def test_write_read_legacy_style(self,default,tmp_path): + with open(tmp_path/'legacy.txt','w') as f: default.save(f,legacy=True) - with open(tmpdir/'legacy.txt') as f: + with open(tmp_path/'legacy.txt') as f: new = Table.load(f) assert all(default.data==new.data) and default.shapes == new.shapes - def test_write_invalid_format(self,default,tmpdir): + def test_write_invalid_format(self,default,tmp_path): with pytest.raises(TypeError): - default.save(tmpdir/'shouldnotbethere.txt',format='invalid') + default.save(tmp_path/'shouldnotbethere.txt',format='invalid') @pytest.mark.parametrize('mode',['str','path']) def test_read_ang(self,reference_dir,mode):