diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-05 18:46:08 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-05 19:44:22 -0300 |
| commit | 2320e1969145546688a6cd06d82fbeed78897046 (patch) | |
| tree | 464afc9456ceb57c1d18505f992a55f88095f442 /tests/component/rpm/test_pq_rpm.py | |
| parent | e75a221260684d9a2d277c7ea2eb7e629caee331 (diff) | |
pq: don't create empty pq branch on rebase and switch
We always want to start from an imported series.
Thanks: Chris Lamb for the reproducer
Diffstat (limited to 'tests/component/rpm/test_pq_rpm.py')
| -rw-r--r-- | tests/component/rpm/test_pq_rpm.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py index d7fdf9cb..114e6507 100644 --- a/tests/component/rpm/test_pq_rpm.py +++ b/tests/component/rpm/test_pq_rpm.py @@ -150,15 +150,13 @@ class TestPqRpm(RpmRepoTestBase): """Basic test for switch action""" repo = self.init_test_repo('gbp-test') branches = repo.get_local_branches() + ['patch-queue/master'] - # Switch to non-existent pq-branch should create one - eq_(mock_pq(['switch']), 0) - self._check_repo_state(repo, 'patch-queue/master', branches) + repo.create_branch('patch-queue/master') # Switch to base branch and back to pq eq_(mock_pq(['switch']), 0) - self._check_repo_state(repo, 'master', branches) - eq_(mock_pq(['switch']), 0) self._check_repo_state(repo, 'patch-queue/master', branches) + eq_(mock_pq(['switch']), 0) + self._check_repo_state(repo, 'master', branches) def test_switch_drop(self): """Basic test for drop action""" |