Merge 972ab88 into b21ea25

GeoscienceAustralia · Mar 9, 2018 · 4e915ed · 4e915ed
2 parents b21ea25 + 972ab88
commit 4e915ed
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/anuga/geospatial_data/tests/test_geospatial_data.py b/anuga/geospatial_data/tests/test_geospatial_data.py
@@ -33,10 +33,12 @@ def test_0(self):
 
         # Check __repr__
         # FIXME (Ole): Is this really machine independent?
-        rep = `G`
+        rep = G.__repr__()
         ref = '[[ 1.   2.1]\n [ 3.   5.3]]'
-        msg = 'Representation %s is not equal to %s' % (rep, ref)
-        assert rep == ref, msg
+        # it seems the leading spaces are removed on some conda builds, so lets allow that too:
+        ref_conda = '[[1.  2.1]\n [3.  5.3]]'
+        msg = 'Representation %s is not equal to %s or %s' % (rep, ref, ref_conda)
+        assert ((rep == ref) or (rep == ref_conda)), msg
 
         #Check getter
         assert num.allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3]])