diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-10-26 18:27:24 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-10-26 18:27:59 +0200 |
| commit | 6849a77d80dba5b1d512bdd246c460c56c426c19 (patch) | |
| tree | cbb993c84d58d06ce94e03bb8aaf5a311aa0d766 /tests | |
| parent | 64053a47a4781ad34fc9925aa86c7394c9c3884e (diff) | |
tests: Test GitRepository.merge()
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_GitRepository.py | 15 |
1 files changed, 13 insertions, 2 deletions
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\:·: |