From cb5754bb9c5a49a21944c0e891c222c0f2744e5c Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 22 Jan 2018 12:36:18 +0200 Subject: tests: add more tagging tests for import-srpm Signed-off-by: Markus Lehtonen --- tests/component/rpm/test_import_srpm.py | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'tests') diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py index f57445b4..02f19aac 100644 --- a/tests/component/rpm/test_import_srpm.py +++ b/tests/component/rpm/test_import_srpm.py @@ -197,6 +197,46 @@ class TestImportPacked(ComponentTestBase): 'gbp-test.spec', 'my.patch', 'my2.patch', 'my3.patch']) self._check_repo_state(repo, 'master', ['master', 'upstream'], files) + def test_tagging(self): + """Test tag options of import-srpm""" + srpm = os.path.join(DATA_DIR, 'gbp-test-1.0-1.src.rpm') + + # Invalid packaging tag keywords + eq_(mock_import(['--no-pristine-tar', '--packaging-tag=%(foo)s', srpm]), + 1) + self._check_log(-1, ".*Missing value 'foo' in *.*") + # Remove upstream tag + repo = GitRepository('gbp-test') + repo.delete_tag('upstream/1.0') + + # Invalid upstream tag keywords + eq_(mock_import(['--no-pristine-tar', '--upstream-tag=%(foo)s', srpm]), + 1) + self._check_log(-1, ".*Missing value 'foo' in.*") + + # Try with good keywords + 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_(repo.describe('upstream'), 'upst/1.0') + + def test_tagging_native(self): + """Test tagging of native packages with import-srpm""" + srpm = os.path.join(DATA_DIR, 'gbp-test-native-1.0-1.src.rpm') + + # Invalid packaging tag keywords + eq_(mock_import(['--no-pristine-tar', '--packaging-tag=%(foo)s', + srpm, '--native']), 1) + self._check_log(-1, ".*Missing value 'foo' in {.*") + + # Try with good keywords, upstream tag format should not matter + eq_(mock_import(['--no-pristine-tar', '--vendor=foo', '--native', + '--packaging-tag=%(vendor)s/%(version)s', + '--upstream-tag=%(foo)s', srpm]), 0) + repo = GitRepository('gbp-test-native') + eq_(repo.describe('HEAD'), 'foo/1.0-1') + def test_misc_options(self): """Test various options of git-import-srpm""" srpm = os.path.join(DATA_DIR, 'gbp-test2-2.0-0.src.rpm') -- cgit v1.2.3