diff options
| author | Guido Günther <agx@sigxcpu.org> | 2016-12-04 20:02:24 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2016-12-05 19:03:26 +0100 |
| commit | e1aec575a8a190b61fee38a4a524033349895671 (patch) | |
| tree | 3bcfb9e5d1250da4ddc23088d7e8838881734972 /tests | |
| parent | a205a137033685d07fd43ae15fc9184ae2340bce (diff) | |
import_rpms: use upstream version for upstream tag
Closes: #846936
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/rpm/test_import_srpm.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py index 6e714c35..b3dfa0aa 100644 --- a/tests/component/rpm/test_import_srpm.py +++ b/tests/component/rpm/test_import_srpm.py @@ -58,7 +58,9 @@ class TestImportPacked(ComponentTestBase): repo = GitRepository('gbp-test') files = {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', 'gbp-test.spec', 'my.patch', 'my2.patch', 'my3.patch'} - self._check_repo_state(repo, 'master', ['master', 'upstream'], files) + self._check_repo_state(repo, 'master', ['master', 'upstream'], + files=files, + tags=['packaging/1.0-1', 'upstream/1.0']) # Two commits: upstream and packaging files eq_(len(repo.get_commits()), 2) @@ -71,8 +73,9 @@ class TestImportPacked(ComponentTestBase): files = {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', 'gbp-test2.spec', 'gbp-test2-alt.spec', 'my.patch', 'my2.patch', 'my3.patch'} - self._check_repo_state(repo, 'master', ['master', 'upstream'], files) - + self._check_repo_state(repo, 'master', ['master', 'upstream'], + files=files, + tags=['packaging/1%2.0-0', 'upstream/1%2.0']) # Two commits: upstream and packaging files eq_(len(repo.get_commits()), 2) @@ -108,7 +111,9 @@ class TestImportPacked(ComponentTestBase): files = {'.gbp.conf', 'Makefile', 'README', 'dummy.sh', 'packaging/gbp-test-native.spec'} repo = GitRepository('gbp-test-native') - self._check_repo_state(repo, 'master', ['master'], files) + self._check_repo_state(repo, 'master', ['master'], + files=files, + tags=['packaging/1.0-1']) # Only one commit: the imported source tarball eq_(len(repo.get_commits()), 1) |