Adapt ignored_dirs and libraries test cases to new Fusesoc class

Author: erikwa

tests/test_ignored_dirs.py

@@ -6,7 +6,7 @@
 import tempfile
 
 from fusesoc.config import Config
-from fusesoc.main import init_coremanager
+from fusesoc.fusesoc import Fusesoc
 
 build_root = "test_build_root"
 
@@ -43,10 +43,13 @@ def test_ignored_dirs():
 
         conf0 = Config(conf_path0)
         assert len(conf0.ignored_dirs) == 0
-        cm0 = init_coremanager(conf0, [td])
-        assert len(cm0.get_cores()) == 2
+        conf0.cores_root = td
+        conf0.write()
+        fs0 = Fusesoc(conf0)
+        assert len(fs0.get_cores()) == 2
 
         conf1 = Config(conf_path1)
         assert len(conf1.ignored_dirs) == 2
-        cm1 = init_coremanager(conf1, [td])
-        assert len(cm1.get_cores()) == 1
+        conf1.cores_root = td
+        fs1 = Fusesoc(conf1)
+        assert len(fs1.get_cores()) == 1

tests/test_libraries.py

@@ -12,6 +12,8 @@
 from test_common import cache_root, cores_root, library_root
 
 from fusesoc.config import Config
+from fusesoc.fusesoc import Fusesoc
+from fusesoc.librarymanager import Library
 
 build_root = "test_build_root"
 
@@ -32,7 +34,6 @@
 
 
 def test_library_location():
-    from fusesoc.main import _get_core, init_coremanager
 
     with tempfile.NamedTemporaryFile(mode="w+") as tcf:
         tcf.write(
@@ -50,10 +51,10 @@ def test_library_location():
 
         conf = Config(tcf.name)
 
-    cm = init_coremanager(conf, [])
+    fs = Fusesoc(conf)
 
-    _get_core(cm, "mor1kx-generic")
-    _get_core(cm, "atlys")
+    fs.get_core("mor1kx-generic")
+    fs.get_core("atlys")
 
 
 def test_library_add(caplog):
@@ -155,7 +156,6 @@ def test_library_add(caplog):
 
 
 def test_library_update(caplog):
-    from fusesoc.main import init_coremanager, init_logging, update
 
     clone_target = tempfile.mkdtemp()
 
@@ -179,34 +179,28 @@ def test_library_update(caplog):
 
     args = Namespace()
 
-    init_logging(False, False)
-    cm = init_coremanager(conf, [])
-
-    # TODO find a better way to set up these defaults
-    args.libraries = []
+    Fusesoc.init_logging(False, False)
+    fs = Fusesoc(conf)
 
     with caplog.at_level(logging.INFO):
-        update(cm, args)
+        fs.update_libraries([])
 
     assert "test_lib : auto-sync disabled. Ignoring update" in caplog.text
 
     caplog.clear()
 
-    args.libraries = ["test_lib"]
-
     with caplog.at_level(logging.INFO):
-        update(cm, args)
+        fs.update_libraries(["test_lib"])
 
     assert "test_lib : Updating..." in caplog.text
 
     caplog.clear()
 
-    args.libraries = []
-    _library = cm._lm.get_library("test_lib")
+    _library = fs.get_library("test_lib")
     _library.auto_sync = True
 
     with caplog.at_level(logging.INFO):
-        update(cm, args)
+        fs.update_libraries([])
 
     assert "test_lib : Updating..." in caplog.text
 
@@ -216,9 +210,7 @@ def test_library_update(caplog):
 
     _library.sync_type = "local"
 
-    args.libraries = []
-
     with caplog.at_level(logging.INFO):
-        update(cm, args)
+        fs.update_libraries([])
 
     assert "test_lib : sync-type is local. Ignoring update" in caplog.text