aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-03-05 08:55:28 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2018-01-17 12:33:10 +0200
commitc8dbfe1281926b45000360727e94d71f9a56deb0 (patch)
tree202c7b90b343e225ce5fce66ceb548a3fc16ee08 /tests
parentc782a29c452eb68bd49951fc8180c907793ae53f (diff)
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 <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/component/rpm/test_pq_rpm.py8
1 files changed, 5 insertions, 3 deletions
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)