From bd9326ba5edcb9d233aef820e1f071dfb256bac2 Mon Sep 17 00:00:00 2001
From: Tom Cobb <tom.cobb@diamond.ac.uk>
Date: Thu, 15 Jun 2017 16:34:33 +0100
Subject: [PATCH] Fixup ca tests

---
 cothread/load_ca.py                         |  2 +-
 tests/{test_unittest.db => soft_records.db} |  0
 tests/{test_unittest.py => test_catools.py} | 10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/{test_unittest.db => soft_records.db} (100%)
 rename tests/{test_unittest.py => test_catools.py} (86%)

diff --git a/cothread/load_ca.py b/cothread/load_ca.py
index ffe6098..186d4a1 100644
--- 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 b/tests/soft_records.db
similarity index 100%
rename from tests/test_unittest.db
rename to tests/soft_records.db
diff --git a/tests/test_unittest.py b/tests/test_catools.py
similarity index 86%
rename from tests/test_unittest.py
rename to tests/test_catools.py
index 6f96294..1ae3522 100755
--- a/tests/test_unittest.py
+++ b/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()