merged from 3.1.2

djekels-zz · Jan 20, 2013 · a17cea5 · a17cea5
1 parent 2f5f27f
commit a17cea5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,8 +1,13 @@
 Changelog
 =========
 
+Changes in Version 1.0.1
+----------------------
+
+- The unit tests now work when running nosetest from the top level dir 
+  and from the test dir
 
-Changes in Version 0.5
+Changes in Version 1.0.0
 ----------------------
 
 - First implementation of the REST API Client

diff --git a/test/test_HP3ParClient_base.py b/test/test_HP3ParClient_base.py
@@ -23,6 +23,7 @@
 import subprocess
 import time
 import pprint
+import inspect
 
 class HP3ParClientBaseTestCase(unittest.TestCase):
 
@@ -34,12 +35,16 @@ def setUp(self):
          if len(sys.argv) >= 2:
              self.debug = sys.argv[1]
 
+         cwd = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+
          self.cl = client.HP3ParClient("http://localhost:5000/api/v1")
          if self.debug == 'debug':
              self.cl.debug_rest(True)
          else: 
+             script = 'test_HP3ParMockServer_flask.py'
+             path = "%s/%s" % (cwd, script)
              self.mockServer = subprocess.Popen([sys.executable, 
-                                                './test_HP3ParMockServer_flask.py'], 
+                                                path], 
                                                 stdout=subprocess.PIPE, 
                                                 stderr=subprocess.PIPE, 
                                                 stdin=subprocess.PIPE)