diff options
author | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-21 15:55:46 +0000 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-21 15:55:46 +0000 |
commit | 7b8c730e53326c89386ffc661a0200df2706e29f (patch) | |
tree | e98e085e4f0a9020725aa3a25df7809a96d807ba /tests/examples/autotools.py | |
parent | bc1b971e169f2fc721c61276c071640caee6a3f8 (diff) | |
parent | f2b15d86debd32241228f7b728016ed0057cd0d2 (diff) | |
download | buildstream-7b8c730e53326c89386ffc661a0200df2706e29f.tar.gz |
Merge branch 'aevri/dirname_basename' into 'master'
tests: str(datafiles) instead of a longer thing
See merge request BuildStream/buildstream!1245
Diffstat (limited to 'tests/examples/autotools.py')
-rw-r--r-- | tests/examples/autotools.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/examples/autotools.py b/tests/examples/autotools.py index 8a411b7a3..9aeafa510 100644 --- a/tests/examples/autotools.py +++ b/tests/examples/autotools.py @@ -21,7 +21,7 @@ DATA_DIR = os.path.join( @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap') @pytest.mark.datafiles(DATA_DIR) def test_autotools_build(cli, datafiles): - project = os.path.join(datafiles.dirname, datafiles.basename) + project = str(datafiles) checkout = os.path.join(cli.directory, 'checkout') # Check that the project can be built correctly. @@ -44,7 +44,7 @@ def test_autotools_build(cli, datafiles): @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap') @pytest.mark.datafiles(DATA_DIR) def test_autotools_run(cli, datafiles): - project = os.path.join(datafiles.dirname, datafiles.basename) + project = str(datafiles) result = cli.run(project=project, args=['build', 'hello.bst']) result.assert_success() |