Merge pull request #957 from karldw/minor-test-bugs

Fix bugs in tests
pysal · Jul 15, 2017 · 3b1ec25 · 3b1ec25
2 parents 3bc7771 + cbb989a
commit 3b1ec25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pysal/cg/tests/test_sphere.py b/pysal/cg/tests/test_sphere.py
@@ -2,7 +2,8 @@
 import pysal
 import math
 import unittest
-
+import numpy as np
+from pysal.common import (RTOL, ATOL)
 
 class Sphere(unittest.TestCase):
 
@@ -70,7 +71,7 @@ def test_geogrid(self):
         pup = (42.023768, -87.946389)    # Arlington Heights IL
         pdown = (41.644415, -87.524102)  # Hammond, IN
         grid1 = sphere.geogrid(pup, pdown, 3, lonx=False)
-        self.assertAlmostEqual(grid, grid1)
+        np.testing.assert_allclose(grid, grid1, rtol=RTOL, atol=ATOL)
 
     def test_toXYZ(self):
         w2 = {0: [2, 5, 6, 10], 1: [4, 7, 9, 14], 2: [6, 0, 3, 8],

diff --git a/pysal/examples/test_examples.py b/pysal/examples/test_examples.py
@@ -1,12 +1,13 @@
 import unittest
 import pysal.examples as ex
+import os
 
 
 class Example_Tester(unittest.TestCase):
     def test_get_path(self):
-        pathparts = ex.get_path('').split('/')
-        self.localpath = '/'.join(pathparts[-3:])
-        self.assertEquals(self.localpath, 'pysal/examples/')
+        pathparts = os.path.normpath(ex.get_path('')).split(os.path.sep)
+        self.localpath = os.path.join(*pathparts[-2:])
+        self.assertEquals(self.localpath, os.path.normpath('pysal/examples/'))
 
     def test_parser(self):
         for example in ex.available():