diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-02-27 13:52:06 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2018-01-22 14:29:59 +0200 |
| commit | 972db70347d5fa37f9af74babf8021a41cb7d219 (patch) | |
| tree | f20661fdbb60f66c74601c56870d7fe574269da1 /tests | |
| parent | cb5754bb9c5a49a21944c0e891c222c0f2744e5c (diff) | |
import-srpm: implement --skip-packaging-tag option
Corresponding the --skip-debian-tag options of import-dsc.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/rpm/test_import_srpm.py | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py index 02f19aac..15db0cf0 100644 --- a/tests/component/rpm/test_import_srpm.py +++ b/tests/component/rpm/test_import_srpm.py @@ -214,12 +214,20 @@ class TestImportPacked(ComponentTestBase): 1) self._check_log(-1, ".*Missing value 'foo' in.*") - # Try with good keywords + # Try with good keywords, with --skip-packaging-tag eq_(mock_import(['--no-pristine-tar', '--vendor=foo', + '--skip-packaging-tag', '--packaging-tag=%(vendor)s/%(version)s', '--upstream-tag=upst/%(version)s', srpm]), 0) - eq_(repo.describe('HEAD'), 'foo/1.0-1') eq_(repo.describe('upstream'), 'upst/1.0') + eq_(len(repo.get_tags()), 1) + + # Re-import, creating packaging tag + eq_(mock_import(['--no-pristine-tar', '--vendor=foo', + '--packaging-tag=%(vendor)s/%(version)s', + '--upstream-tag=upst/%(version)s', srpm]), 0) + eq_(repo.describe('HEAD'), 'foo/1.0-1') + eq_(len(repo.get_tags()), 2) def test_tagging_native(self): """Test tagging of native packages with import-srpm""" @@ -230,11 +238,19 @@ class TestImportPacked(ComponentTestBase): srpm, '--native']), 1) self._check_log(-1, ".*Missing value 'foo' in {.*") - # Try with good keywords, upstream tag format should not matter + # Try with good keywords, with --skip-packaging-tag. + # Upstream tag format should not matter eq_(mock_import(['--no-pristine-tar', '--vendor=foo', '--native', + '--skip-packaging-tag', '--packaging-tag=%(vendor)s/%(version)s', '--upstream-tag=%(foo)s', srpm]), 0) repo = GitRepository('gbp-test-native') + eq_(len(repo.get_tags()), 0) + + # Run again, now creating packaging tag + eq_(mock_import(['--no-pristine-tar', '--vendor=foo', '--native', + '--packaging-tag=%(vendor)s/%(version)s', + '--upstream-tag=%(foo)s', srpm]), 0) eq_(repo.describe('HEAD'), 'foo/1.0-1') def test_misc_options(self): |