summaryrefslogtreecommitdiff
path: root/tests/loader/basics.py
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-10-07 20:51:45 +0900
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-11-02 11:55:11 +0000
commit4fd9dc3e5ca1b44affe04e97ab1dc40efa97a6e5 (patch)
tree28ce3622c40ddcfa5e260e97f2457f5c34ef5446 /tests/loader/basics.py
parentcd37db61bfa29e2f2732188496bc0977004c36b7 (diff)
downloadbuildstream-sam/1.0-pre.tar.gz
Updating all test cases for the removal of architecture conditionals and optionssam/1.0-pre
Diffstat (limited to 'tests/loader/basics.py')
-rw-r--r--tests/loader/basics.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/loader/basics.py b/tests/loader/basics.py
index c85477898..e7eaea5b0 100644
--- a/tests/loader/basics.py
+++ b/tests/loader/basics.py
@@ -19,7 +19,7 @@ DATA_DIR = os.path.join(
def test_one_file(datafiles):
basedir = os.path.join(datafiles.dirname, datafiles.basename)
- loader = Loader(basedir, 'elements/onefile.bst', make_options(basedir), None, None)
+ loader = Loader(basedir, 'elements/onefile.bst', make_options(basedir))
element = loader.load()
@@ -31,7 +31,7 @@ def test_one_file(datafiles):
def test_missing_file(datafiles):
basedir = os.path.join(datafiles.dirname, datafiles.basename)
- loader = Loader(basedir, 'elements/missing.bst', make_options(basedir), None, None)
+ loader = Loader(basedir, 'elements/missing.bst', make_options(basedir))
with pytest.raises(LoadError) as exc:
element = loader.load()
@@ -43,7 +43,7 @@ def test_missing_file(datafiles):
def test_invalid_reference(datafiles):
basedir = os.path.join(datafiles.dirname, datafiles.basename)
- loader = Loader(basedir, 'elements/badreference.bst', make_options(basedir), None, None)
+ loader = Loader(basedir, 'elements/badreference.bst', make_options(basedir))
with pytest.raises(LoadError) as exc:
element = loader.load()
@@ -55,7 +55,7 @@ def test_invalid_reference(datafiles):
def test_invalid_yaml(datafiles):
basedir = os.path.join(datafiles.dirname, datafiles.basename)
- loader = Loader(basedir, 'elements/badfile.bst', make_options(basedir), None, None)
+ loader = Loader(basedir, 'elements/badfile.bst', make_options(basedir))
with pytest.raises(LoadError) as exc:
element = loader.load()
@@ -70,7 +70,7 @@ def test_fail_fullpath_target(datafiles):
fullpath = os.path.join(basedir, 'elements', 'onefile.bst')
with pytest.raises(LoadError) as exc:
- loader = Loader(basedir, fullpath, make_options(basedir), None, None)
+ loader = Loader(basedir, fullpath, make_options(basedir))
assert (exc.value.reason == LoadErrorReason.INVALID_DATA)
@@ -79,7 +79,7 @@ def test_fail_fullpath_target(datafiles):
def test_invalid_key(datafiles):
basedir = os.path.join(datafiles.dirname, datafiles.basename)
- loader = Loader(basedir, 'elements/invalidkey.bst', make_options(basedir), None, None)
+ loader = Loader(basedir, 'elements/invalidkey.bst', make_options(basedir))
with pytest.raises(LoadError) as exc:
element = loader.load()