Moved parts/capart.py to parts/ca/capart.py

dls-controls · Jul 18, 2016 · c7927b1 · c7927b1
1 parent 3d3e8a5
commit c7927b1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/malcolm/parts/ca/__init__.py b/malcolm/parts/ca/__init__.py
diff --git a/malcolm/parts/capart.py → malcolm/parts/ca/capart.py b/malcolm/parts/capart.py → malcolm/parts/ca/capart.py
diff --git a/tests/test_parts/test_ca/__init__.py b/tests/test_parts/test_ca/__init__.py
diff --git a/tests/test_parts/test_capart.py → tests/test_parts/test_ca/test_capart.py b/tests/test_parts/test_capart.py → tests/test_parts/test_ca/test_capart.py
@@ -1,6 +1,6 @@
 import os
 import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 import setup_malcolm_paths
 
 import unittest
@@ -34,15 +34,15 @@ def test_init(self):
         p.block.add_attribute.assert_called_once_with(p.attr)
 
     def test_init_no_rbv(self):
-        from malcolm.parts.capart import CAPart
+        from malcolm.parts.ca.capart import CAPart
         meta = MagicMock()
         meta.name = "meta"
         p = CAPart("me", MagicMock(), MagicMock(), meta, "pv")
         self.assertEqual(p.rbv, "pv")
         self.assertEqual(p.pv, "pv")
 
     def create_part(self):
-        from malcolm.parts.capart import CAPart
+        from malcolm.parts.ca.capart import CAPart
         process = MagicMock()
         block = MagicMock()
         meta = MagicMock()