diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-10-18 09:24:18 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-10-19 16:21:44 +0200 |
| commit | 680784b0dd2a431392eea653a52c0fb9298d7b88 (patch) | |
| tree | 69c695d636225c1a529889c672d4808c7a125f49 /tests/component | |
| parent | 096ae4a34f7e5ab69cff115682629d906b1a23ce (diff) | |
pq: import patches before rebase
if the pq branch doesn't exist yet.
Closes: #876800
Diffstat (limited to 'tests/component')
| -rw-r--r-- | tests/component/deb/test_pq.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/component/deb/test_pq.py b/tests/component/deb/test_pq.py index 9c7f0788..2f0f247e 100644 --- a/tests/component/deb/test_pq.py +++ b/tests/component/deb/test_pq.py @@ -36,13 +36,24 @@ class TestPq(ComponentTestBase): ok_(ret == 0, "Running gbp pq %s failed" % action) @RepoFixtures.quilt30() + def test_rebase_import(self, repo): + """Test if rebase imports patches first""" + eq_(repo.has_branch('patch-queue/master'), False) + self._test_pq(repo, 'rebase') + eq_(repo.has_branch('patch-queue/master'), True) + + @RepoFixtures.quilt30() def test_empty_cycle(self, repo): eq_(repo.has_branch('patch-queue/master'), False) + eq_(repo.branch, 'master') self._test_pq(repo, 'import') eq_(repo.has_branch('patch-queue/master'), True) + eq_(repo.branch, 'patch-queue/master') self._test_pq(repo, 'rebase') + eq_(repo.branch, 'patch-queue/master') self._test_pq(repo, 'export') eq_(repo.has_branch('patch-queue/master'), True) + eq_(repo.branch, 'master') self._test_pq(repo, 'drop') eq_(repo.has_branch('patch-queue/master'), False) |