From 7a503e926669041847f568d1ee26ff948e261ffd Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 28 Nov 2014 18:28:51 +0200 Subject: pq: move switch_pq() to common So that it can be re-used by the upcoming pq-rpm tool. Signed-off-by: Markus Lehtonen --- tests/13_test_gbp_pq.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py index 910ce20..d88f7ae 100644 --- a/tests/13_test_gbp_pq.py +++ b/tests/13_test_gbp_pq.py @@ -21,7 +21,7 @@ import os import logging import unittest -from gbp.scripts.pq import generate_patches, switch_pq, export_patches +from gbp.scripts.pq import generate_patches, export_patches import gbp.scripts.common.pq as pq import gbp.patch_series import tests.testutils as testutils @@ -145,12 +145,12 @@ class TestExport(testutils.DebianGitTestRepo): """Test if we drop the patch-queue branch with --drop""" repo = self.repo start = repo.get_branch() - pq = os.path.join('patch-queue', start) - switch_pq(repo, start) - self.assertEqual(repo.get_branch(), pq) - export_patches(repo, pq, TestExport.Options) + pq_branch = os.path.join('patch-queue', start) + pq.switch_pq(repo, start) + self.assertEqual(repo.get_branch(), pq_branch) + export_patches(repo, pq_branch, TestExport.Options) self.assertEqual(repo.get_branch(), start) - self.assertFalse(repo.has_branch(pq)) + self.assertFalse(repo.has_branch(pq_branch)) def _patch_path(name): -- cgit v1.2.3