Fixup ca tests

DiamondLightSource · Jun 15, 2017 · bd9326b · bd9326b
1 parent b82954f
commit bd9326b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cothread/load_ca.py b/cothread/load_ca.py
@@ -38,7 +38,7 @@
 import platform
 import os
 
-from .epicsarch import epics_host_arch
+from epicsarch import epics_host_arch
 
 # Figure out the libraries that need to be loaded and the loading method.
 load_library = ctypes.cdll.LoadLibrary

diff --git a/tests/test_unittest.db → tests/soft_records.db b/tests/test_unittest.db → tests/soft_records.db
diff --git a/tests/test_unittest.py → tests/test_catools.py b/tests/test_unittest.py → tests/test_catools.py
@@ -1,18 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
+import os
 from cothread import counittest, catools
 
+here = os.path.dirname(__file__)
+
+
 class SoftIocTest(counittest.TestCase):
     iocexe = 'softIoc'
     iocload = (
-        ('tests/test_unittest.db', 'P=$(TESTPREFIX)'),
+        (os.path.join(here, 'soft_records.db'), 'P=$(TESTPREFIX)'),
     )
     iocpost = "dbl\r"
 
-    def test_nothing(self):
-        self.assertTrue(True)
-
     def test_ai(self):
         # wait for CA server to start
         self.assertIOCRunning()