pq: move switch_pq() to common

So that it can be re-used by the upcoming pq-rpm tool.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py
index 910ce206..d88f7aed 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):