From 6849a77d80dba5b1d512bdd246c460c56c426c19 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 26 Oct 2011 18:27:24 +0200
Subject: tests: Test GitRepository.merge()

---
 tests/test_GitRepository.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/test_GitRepository.py b/tests/test_GitRepository.py
index 88ea5df1..fd247dc6 100644
--- a/tests/test_GitRepository.py
+++ b/tests/test_GitRepository.py
@@ -245,6 +245,19 @@ def test_clone():
     'foo'
     """
 
+def test_merge():
+    """
+    Merge a branch
+
+    Methods tested:
+         - L{gbp.git.GitRepository.merge}
+         - L{gbp.git.GitRepository.set_branch}
+
+    >>> import gbp.git
+    >>> repo = gbp.git.GitRepository(repo_dir)
+    >>> repo.set_branch('master')
+    >>> repo.merge('foo')
+    """
 
 def test_teardown():
     """
@@ -257,6 +270,4 @@ def test_teardown():
             shutil.rmtree(clone_dir)
     """
 
-
-
 # vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
-- 
cgit v1.2.3