diff --git a/.travis.yml b/.travis.yml index ba68230fe..77839a730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: script: - export OMPI_MCA_btl_vader_single_copy_mechanism=none - python --version - - python runtests.py -n + - pytest --pyargs anuga after_success: - diff --git a/anuga/pmesh/tests/test_mesh_interface.py b/anuga/pmesh/tests/test_mesh_interface.py index 203656488..487d10c20 100644 --- a/anuga/pmesh/tests/test_mesh_interface.py +++ b/anuga/pmesh/tests/test_mesh_interface.py @@ -4,6 +4,7 @@ import tempfile import unittest import os +import pytest from anuga.pmesh.mesh import importMeshFromFile from anuga.pmesh.mesh_interface import create_mesh_from_regions @@ -20,6 +21,7 @@ def setUp(self): def tearDown(self): pass + def test_create_mesh_from_regions(self): x=-500 y=-1000 @@ -100,6 +102,7 @@ def test_create_mesh_from_regions(self): closed=False), 'FAILED!') + def test_create_mesh_from_regions_with_caching(self): x=-500 y=-1000 @@ -208,6 +211,7 @@ def test_create_mesh_from_regions_with_caching(self): verbose=False, use_cache=True) + def test_create_mesh_from_regions2(self): # These are the absolute values min_x = -10 @@ -249,7 +253,8 @@ def test_create_mesh_from_regions2(self): self.assertTrue(m.geo_reference.get_zone()==zone, 'FAILED!') self.assertTrue(m.geo_reference.get_xllcorner()==min_x, 'FAILED!') self.assertTrue(m.geo_reference.get_yllcorner()==min_y, 'FAILED!') - + + def test_create_mesh_from_regions3(self): # These are the absolute values min_x = -10 @@ -290,6 +295,7 @@ def test_create_mesh_from_regions3(self): self.assertTrue(m.geo_reference.get_xllcorner() == min_x, 'FAILED!') self.assertTrue(m.geo_reference.get_yllcorner() == min_y, 'FAILED!') + def test_create_mesh_from_regions4(self): file_name = tempfile.mktemp('.tsh') @@ -336,6 +342,7 @@ def test_create_mesh_from_regions4(self): os.remove(file_name) + def test_create_mesh_from_regions5(self): file_name = tempfile.mktemp('.tsh') @@ -371,6 +378,7 @@ def test_create_mesh_from_regions5(self): os.remove(file_name) + def test_create_mesh_from_regions6(self): file_name = tempfile.mktemp('.tsh') @@ -413,6 +421,7 @@ def test_create_mesh_from_regions6(self): os.remove(file_name) + def test_create_mesh_from_regions7(self): file_name = tempfile.mktemp('.tsh') @@ -458,6 +467,7 @@ def test_create_mesh_from_regions7(self): os.remove(file_name) + def test_create_mesh_from_regions_interior_regions(self): '''Test that create_mesh_from_regions fails when an interior region is outside bounding polygon. @@ -497,6 +507,7 @@ def test_create_mesh_from_regions_interior_regions(self): msg += 'cause an Exception to be raised' raise Exception(msg) + def test_create_mesh_from_regions_interior_regions1(self): '''Test that create_mesh_from_regions fails when an interior region is outside bounding polygon. @@ -564,6 +575,7 @@ def test_create_mesh_from_regions_interior_regions1(self): msg += 'cause an Exception to be raised' raise Exception(msg) + def FIXMEtest_create_mesh_with_multiply_tagged_segments(self): '''Test that create_mesh_from_regions fails when segments are listed repeatedly in boundary_tags. @@ -634,7 +646,8 @@ def test_create_mesh_with_segments_out_of_bounds(self): msg = 'Tags are listed repeatedly, but create mesh from regions ' msg += 'does not cause an Exception to be raised' raise Exception(msg) - + + def test_create_mesh_with_breaklines(self): # These are the absolute values polygon = [[100,100], [1000,100], [1000,1000], [100,1000]] @@ -651,7 +664,7 @@ def test_create_mesh_with_breaklines(self): self.assertTrue(len(segs) == 5, 'FAILED!') self.assertTrue(len(m.userVertices) == 6, 'FAILED!') - + def test_create_mesh_with_interior_holes(self): # These are the absolute values polygon = [[100,100], [1000,100], [1000,1000], [100,1000]] diff --git a/anuga/utilities/log.py b/anuga/utilities/log.py index 71f468e71..296235261 100644 --- a/anuga/utilities/log.py +++ b/anuga/utilities/log.py @@ -160,8 +160,8 @@ def log(msg, level=None): # why are we here? ... Oh yes! Log the message! if _new_python: #FIXME SR: On 2022/12/20 got an error due to the extra argument - #logging.log(level, msg, extra={'mname': fname, 'lnum': lnum}) - logging.log(level, msg) + logging.log(level, msg, extra={'mname': fname, 'lnum': lnum}) + #logging.log(level, msg) else: logging.log(level, msg) diff --git a/appveyor.yml b/appveyor.yml index 298ceadea..74ff3bcc1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,4 +29,4 @@ build_script: - pip install -e . test_script: - - python runtests.py -n \ No newline at end of file + - pytest --pyargs anuga \ No newline at end of file