From c8dbfe1281926b45000360727e94d71f9a56deb0 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 5 Mar 2015 08:55:28 +0200 Subject: pq-rpm: implement --drop option Makes it possible to automatically drop the pq-branch after a successful export. Counterpart for the --drop option of (deb) gbp-pq. Signed-off-by: Markus Lehtonen --- tests/component/rpm/test_pq_rpm.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py index 57f74d9f..16044fdc 100644 --- a/tests/component/rpm/test_pq_rpm.py +++ b/tests/component/rpm/test_pq_rpm.py @@ -113,9 +113,11 @@ class TestPqRpm(RpmRepoTestBase): self._check_repo_state(repo, 'patch-queue/master-orphan', branches, files) - # Test export - eq_(mock_pq(['export', '--upstream-tag', 'upstream/%(version)s', - '--spec-file', 'packaging/gbp-test2.spec']), 0) + # Test export with --drop + branches.remove('patch-queue/master-orphan') + eq_(mock_pq(['export', '--drop', '--upstream-tag', + 'upstream/%(version)s', '--spec-file', + 'packaging/gbp-test2.spec']), 0) self._check_repo_state(repo, 'master-orphan', branches, clean=False) eq_(repo.status()[' M'], [b'packaging/gbp-test2.spec']) self._has_patches('packaging/gbp-test2.spec', patches) -- cgit v1.2.3