Adjust tests to new API

1 files changed, 20 insertions, 20 deletions

diff --git a/tests/loader/dependencies.py b/tests/loader/dependencies.py
index 3a4fee278..342af96ef 100644
--- a/tests/loader/dependencies.py
+++ b/tests/loader/dependencies.py
@@ -19,8 +19,8 @@ DATA_DIR = os.path.join(
 def test_two_files(datafiles):
 
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/target.bst', make_options(basedir), None, None)
-    element = loader.load()
+    loader = Loader(basedir, ['elements/target.bst'], make_options(basedir), None, None)
+    element = loader.load()[0]
 
     assert(isinstance(element, MetaElement))
     assert(element.kind == 'pony')
@@ -35,8 +35,8 @@ def test_two_files(datafiles):
 def test_shared_dependency(datafiles):
 
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/shareddeptarget.bst', make_options(basedir), None, None)
-    element = loader.load()
+    loader = Loader(basedir, ['elements/shareddeptarget.bst'], make_options(basedir), None, None)
+    element = loader.load()[0]
 
     # Toplevel is 'pony' with 2 dependencies
     #
@@ -78,8 +78,8 @@ def test_shared_dependency(datafiles):
 def test_dependency_dict(datafiles):
 
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/target-depdict.bst', make_options(basedir), None, None)
-    element = loader.load()
+    loader = Loader(basedir, ['elements/target-depdict.bst'], make_options(basedir), None, None)
+    element = loader.load()[0]
 
     assert(isinstance(element, MetaElement))
     assert(element.kind == 'pony')
@@ -93,10 +93,10 @@ def test_dependency_dict(datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 def test_invalid_dependency_declaration(datafiles):
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/invaliddep.bst', make_options(basedir), None, None)
+    loader = Loader(basedir, ['elements/invaliddep.bst'], make_options(basedir), None, None)
 
     with pytest.raises(LoadError) as exc:
-        element = loader.load()
+        element = loader.load()[0]
 
     assert (exc.value.reason == LoadErrorReason.INVALID_DATA)
 
@@ -104,10 +104,10 @@ def test_invalid_dependency_declaration(datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 def test_circular_dependency(datafiles):
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/circulartarget.bst', make_options(basedir), None, None)
+    loader = Loader(basedir, ['elements/circulartarget.bst'], make_options(basedir), None, None)
 
     with pytest.raises(LoadError) as exc:
-        element = loader.load()
+        element = loader.load()[0]
 
     assert (exc.value.reason == LoadErrorReason.CIRCULAR_DEPENDENCY)
 
@@ -115,10 +115,10 @@ def test_circular_dependency(datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 def test_invalid_dependency_type(datafiles):
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/invaliddeptype.bst', make_options(basedir), None, None)
+    loader = Loader(basedir, ['elements/invaliddeptype.bst'], make_options(basedir), None, None)
 
     with pytest.raises(LoadError) as exc:
-        element = loader.load()
+        element = loader.load()[0]
 
     assert (exc.value.reason == LoadErrorReason.INVALID_DATA)
 
@@ -126,8 +126,8 @@ def test_invalid_dependency_type(datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 def test_build_dependency(datafiles):
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/builddep.bst', make_options(basedir), None, None)
-    element = loader.load()
+    loader = Loader(basedir, ['elements/builddep.bst'], make_options(basedir), None, None)
+    element = loader.load()[0]
 
     assert(isinstance(element, MetaElement))
     assert(element.kind == 'pony')
@@ -142,8 +142,8 @@ def test_build_dependency(datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 def test_runtime_dependency(datafiles):
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/runtimedep.bst', make_options(basedir), None, None)
-    element = loader.load()
+    loader = Loader(basedir, ['elements/runtimedep.bst'], make_options(basedir), None, None)
+    element = loader.load()[0]
 
     assert(isinstance(element, MetaElement))
     assert(element.kind == 'pony')
@@ -158,8 +158,8 @@ def test_runtime_dependency(datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 def test_build_runtime_dependency(datafiles):
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/target.bst', make_options(basedir), None, None)
-    element = loader.load()
+    loader = Loader(basedir, ['elements/target.bst'], make_options(basedir), None, None)
+    element = loader.load()[0]
 
     assert(isinstance(element, MetaElement))
     assert(element.kind == 'pony')
@@ -175,8 +175,8 @@ def test_build_runtime_dependency(datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 def test_all_dependency(datafiles):
     basedir = os.path.join(datafiles.dirname, datafiles.basename)
-    loader = Loader(basedir, 'elements/alldep.bst', make_options(basedir), None, None)
-    element = loader.load()
+    loader = Loader(basedir, ['elements/alldep.bst'], make_options(basedir), None, None)
+    element = loader.load()[0]
 
     assert(isinstance(element, MetaElement))
     assert(element.kind == 'pony')