diff options
Diffstat (limited to 'tests/loader/dependencies.py')
| -rw-r--r-- | tests/loader/dependencies.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/loader/dependencies.py b/tests/loader/dependencies.py index 3a4fee278..52d3ee23c 100644 --- a/tests/loader/dependencies.py +++ b/tests/loader/dependencies.py @@ -19,7 +19,7 @@ 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) + loader = Loader(basedir, 'elements/target.bst', make_options(basedir)) element = loader.load() assert(isinstance(element, MetaElement)) @@ -35,7 +35,7 @@ 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) + loader = Loader(basedir, 'elements/shareddeptarget.bst', make_options(basedir)) element = loader.load() # Toplevel is 'pony' with 2 dependencies @@ -78,7 +78,7 @@ 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) + loader = Loader(basedir, 'elements/target-depdict.bst', make_options(basedir)) element = loader.load() assert(isinstance(element, MetaElement)) @@ -93,7 +93,7 @@ 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)) with pytest.raises(LoadError) as exc: element = loader.load() @@ -104,7 +104,7 @@ 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)) with pytest.raises(LoadError) as exc: element = loader.load() @@ -115,7 +115,7 @@ 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)) with pytest.raises(LoadError) as exc: element = loader.load() @@ -126,7 +126,7 @@ 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) + loader = Loader(basedir, 'elements/builddep.bst', make_options(basedir)) element = loader.load() assert(isinstance(element, MetaElement)) @@ -142,7 +142,7 @@ 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) + loader = Loader(basedir, 'elements/runtimedep.bst', make_options(basedir)) element = loader.load() assert(isinstance(element, MetaElement)) @@ -158,7 +158,7 @@ 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) + loader = Loader(basedir, 'elements/target.bst', make_options(basedir)) element = loader.load() assert(isinstance(element, MetaElement)) @@ -175,7 +175,7 @@ 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) + loader = Loader(basedir, 'elements/alldep.bst', make_options(basedir)) element = loader.load() assert(isinstance(element, MetaElement)) |