wip

1 files changed, 8 insertions, 10 deletions

diff --git a/test/doit/test_doit.py b/test/doit/test_doit.py
index ff480c5..7708ca7 100644
--- a/test/doit/test_doit.py
+++ b/test/doit/test_doit.py
@@ -1,6 +1,8 @@
-import pytest
-import os.path
+import logging
 import os
+import os.path
+import pytest
+import logging
 
 filedir = os.path.dirname(os.path.abspath(__file__))
 schematics_dir = os.path.join(filedir, "schematics")
@@ -20,20 +22,16 @@ def exec_task(task):
         else:
             a()
 
-def test_doit(tmpdir):
+def test_doit(tmpdir, caplog):
     from ee.kicad.doit import KicadDoitTasks
 
     args = dict(
         sch=os.path.join(schematics_dir, "schematic-1.sch"),
-        kicad_sch_object_set_dir=os.path.join(tmpdir, "kicad-sch"),
-        component_object_set_dir=os.path.join(tmpdir, "component"),
+        data_set_dir=os.path.join(tmpdir, "ee"),
     )
     tasks = list(KicadDoitTasks(**args).tasks())
     assert(len(tasks) > 1)
-    create_kicad_sch_objects = find_task(tasks, "create-kicad-sch-objects")
-    exec_task(create_kicad_sch_objects)
-
-    kicad_sch_to_component_object = find_task(tasks, "kicad-sch-to-component-object")
-    exec_task(kicad_sch_to_component_object)
+    exec_task(find_task(tasks, "kicad-sch-to-data-set"))
+    exec_task(find_task(tasks, "kicad-create-component-data-set"))
 
 # thirdparty/olinuxino/HARDWARE/A64-OLinuXino/A64-OLinuXino_Rev_C/A64-OlinuXino_Rev_C.sch