diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-05-11 10:56:17 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:22:10 +0200 |
| commit | 3ba82da1d9b3df58e8d0b709d2ac3b45a3d8d40c (patch) | |
| tree | 5ceb34bd6ac68706d9ef8d682df28141876c73ab /tests | |
| parent | d0812e2c928457f7048fa57d58fa5eafcf25d018 (diff) | |
| download | git-buildpackage-3ba82da1d9b3df58e8d0b709d2ac3b45a3d8d40c.tar.gz git-buildpackage-3ba82da1d9b3df58e8d0b709d2ac3b45a3d8d40c.tar.bz2 git-buildpackage-3ba82da1d9b3df58e8d0b709d2ac3b45a3d8d40c.zip | |
gbp-pq: readiness to configure the pq branch name
All other gbp branches have configurable names. This commit adds the
readiness for user to configure/change the name of the patch-queue
branches, as well.
Patch-queue is defined in options as a format string, where '%(branch)s'
refers to the debian/packaging branch. If the pq-branch format string
does not contain '%(branch)s', there is only one patch-queue branch and
the debian/packaging branch is used as its base branch. That is, e.g. a
'gbp-pq switch' operation from the patch-queue branch always switches to
the debian/packaging branch.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Olev Kartau <olev.kartau@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/13_test_gbp_pq.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py index 910ce206..1ae4b62a 100644 --- a/tests/13_test_gbp_pq.py +++ b/tests/13_test_gbp_pq.py @@ -91,7 +91,8 @@ class TestApplySinglePatch(testutils.DebianGitTestRepo): patch = gbp.patch_series.Patch(_patch_path('foo.patch')) - pq.apply_single_patch(self.repo, 'master', patch, None) + dummy_opts = object() + pq.apply_single_patch(self.repo, 'master', patch, None, dummy_opts) self.assertIn('foo', self.repo.list_files()) class TestWritePatch(testutils.DebianGitTestRepo): @@ -146,7 +147,7 @@ class TestExport(testutils.DebianGitTestRepo): repo = self.repo start = repo.get_branch() pq = os.path.join('patch-queue', start) - switch_pq(repo, start) + switch_pq(repo, start, TestExport.Options) self.assertEqual(repo.get_branch(), pq) export_patches(repo, pq, TestExport.Options) self.assertEqual(repo.get_branch(), start) |