diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-08-30 06:34:00 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-08-30 06:34:00 +0000 |
| commit | 9aeed43c44b2c133666e0be6ccbbcd36e287363f (patch) | |
| tree | 411e4fd6b093135423a22a0996648d9c86f94ede | |
| parent | 4a644deb585c5f104dbd3b0696fcf3ab1a51f14a (diff) | |
| parent | 8498de5a018c0c80d0b5ec7c3aaea49403c45d65 (diff) | |
| download | buildstream-9aeed43c44b2c133666e0be6ccbbcd36e287363f.tar.gz | |
Merge branch 'tristan/reduce-filter-tests-1.2' into 'bst-1.2'
tests/plugins/filter.py: Don't run redundant tests
See merge request BuildStream/buildstream!754
| -rw-r--r-- | tests/plugins/filter.py | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/tests/plugins/filter.py b/tests/plugins/filter.py index 4a5ff3402..559815a8b 100644 --- a/tests/plugins/filter.py +++ b/tests/plugins/filter.py @@ -174,9 +174,8 @@ def test_filter_workspace_reset(datafiles, cli, tmpdir): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'basic')) -@pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS if kind not in ("patch", "local")]) -def test_filter_track(datafiles, cli, tmpdir, kind): - repo = create_repo(kind, str(tmpdir)) +def test_filter_track(datafiles, cli, tmpdir): + repo = create_repo('git', str(tmpdir)) ref = repo.create(os.path.join(str(datafiles), "files")) elements_dir = os.path.join(str(tmpdir), "elements") project = str(tmpdir) @@ -228,9 +227,8 @@ def test_filter_track(datafiles, cli, tmpdir, kind): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'basic')) -@pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS if kind not in ("patch", "local")]) -def test_filter_track_excepted(datafiles, cli, tmpdir, kind): - repo = create_repo(kind, str(tmpdir)) +def test_filter_track_excepted(datafiles, cli, tmpdir): + repo = create_repo('git', str(tmpdir)) ref = repo.create(os.path.join(str(datafiles), "files")) elements_dir = os.path.join(str(tmpdir), "elements") project = str(tmpdir) @@ -282,9 +280,8 @@ def test_filter_track_excepted(datafiles, cli, tmpdir, kind): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'basic')) -@pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS if kind not in ("patch", "local")]) -def test_filter_track_multi_to_one(datafiles, cli, tmpdir, kind): - repo = create_repo(kind, str(tmpdir)) +def test_filter_track_multi_to_one(datafiles, cli, tmpdir): + repo = create_repo('git', str(tmpdir)) ref = repo.create(os.path.join(str(datafiles), "files")) elements_dir = os.path.join(str(tmpdir), "elements") project = str(tmpdir) @@ -336,9 +333,8 @@ def test_filter_track_multi_to_one(datafiles, cli, tmpdir, kind): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'basic')) -@pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS if kind not in ("patch", "local")]) -def test_filter_track_multi(datafiles, cli, tmpdir, kind): - repo = create_repo(kind, str(tmpdir)) +def test_filter_track_multi(datafiles, cli, tmpdir): + repo = create_repo('git', str(tmpdir)) ref = repo.create(os.path.join(str(datafiles), "files")) elements_dir = os.path.join(str(tmpdir), "elements") project = str(tmpdir) @@ -398,9 +394,8 @@ def test_filter_track_multi(datafiles, cli, tmpdir, kind): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'basic')) -@pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS if kind not in ("patch", "local")]) -def test_filter_track_multi_exclude(datafiles, cli, tmpdir, kind): - repo = create_repo(kind, str(tmpdir)) +def test_filter_track_multi_exclude(datafiles, cli, tmpdir): + repo = create_repo('git', str(tmpdir)) ref = repo.create(os.path.join(str(datafiles), "files")) elements_dir = os.path.join(str(tmpdir), "elements") project = str(tmpdir) |