[Patchew-devel] [PATCH v2 07/11] testing: Move do_apply to base class

Fam Zheng famz at redhat.com
Fri Jul 27 03:59:30 UTC 2018


Signed-off-by: Fam Zheng <famz at redhat.com>
---
 tests/patchewtest.py | 5 +++++
 tests/test_git.py    | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/patchewtest.py b/tests/patchewtest.py
index 5bed3b9..9d34555 100644
--- a/tests/patchewtest.py
+++ b/tests/patchewtest.py
@@ -100,6 +100,11 @@ class PatchewTestCase(django.test.LiveServerTestCase):
     def cli_import(self, mbox, rc=0):
         self.check_cli(["import", self.get_data_path(mbox)], rc)
 
+    def do_apply(self):
+        self.cli(["apply", "--applier-mode"])
+        for s in Message.objects.series_heads():
+            self.assertNotEqual(s.git_result.status, Result.PENDING)
+
     def get_data_path(self, fname):
         r = tempfile.NamedTemporaryFile(dir=RUN_DIR, prefix="test-data-", delete=False)
         d = os.path.join(BASE_DIR, "tests", "data", fname)
diff --git a/tests/test_git.py b/tests/test_git.py
index b2802d5..31e9823 100755
--- a/tests/test_git.py
+++ b/tests/test_git.py
@@ -31,11 +31,6 @@ class GitTest(PatchewTestCase):
     def cleanUp(self):
         shutil.rmtree(self.repo)
 
-    def do_apply(self):
-        self.cli(["apply", "--applier-mode"])
-        for s in Message.objects.series_heads():
-            self.assertNotEqual(s.git_result.status, Result.PENDING)
-
     def test_need_apply(self):
         self.cli_import("0001-simple-patch.mbox.gz")
         s = Message.objects.series_heads()[0]
-- 
2.17.1




More information about the Patchew-devel mailing list