[Pkg-bazaar-commits] ./bzr-gtk/unstable r504: Tweaks to failing tests

[Martin Albisetti]

------------------------------------------------------------
revno: 504
committer: Martin Albisetti <argentina at gmail.com>
branch nick: gtk.merges
timestamp: Fri 2008-06-20 00:43:29 -0300
message:
  Tweaks to failing tests
modified:
  tests/test_commit.py
    ------------------------------------------------------------
    revno: 500.1.2
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: gtk
    timestamp: Tue 2008-06-10 17:25:47 +0200
    message:
      Fix third failing test (thanks to jam).
      
      * tests/test_commit.py:
      (TestPendingRevisions.test_pending_revisions_multi_merge): Fix
      provided by jam: bzr we now filter the pending merges so that only
      the 'heads()' are included. We just ensure that the pending merges
      contain the unique tips for the ancestries.
    modified:
      tests/test_commit.py
-------------- next part --------------
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2008-06-09 15:59:13 +0000
+++ b/tests/test_commit.py	2008-06-10 15:25:47 +0000
@@ -81,8 +81,8 @@
         rev_id1 = tree.commit('one')
         tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
         rev_id2 = tree2.commit('two')
-        rev_id3 = tree2.commit('three')
         tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
+        rev_id3 = tree2.commit('three')
         rev_id4 = tree3.commit('four')
         rev_id5 = tree3.commit('five')
         tree.merge_from_branch(tree2.branch)