Rev 2017: Fix another test. in file:///data/jelmer/bzr-svn/0.5/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.5/

------------------------------------------------------------
revno: 2017
revision-id: jelmer at samba.org-20081118042314-3cakbhcdm96sqhq0
parent: jelmer at samba.org-20081118042110-xwnr8vym0275wq5h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Tue 2008-11-18 05:23:14 +0100
message:
  Fix another test.
modified:
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py	2008-09-09 18:53:33 +0000
+++ b/tests/test_fetch.py	2008-11-18 04:23:14 +0000
@@ -1266,8 +1266,12 @@
 
         branch = Branch.open("%s/branches/mybranch" % repos_url)
         mapping = oldrepos.get_mapping()
-        self.assertEqual([oldrepos.generate_revision_id(2, "branches/mybranch", mapping)], 
-                         branch.revision_history())
+        if mapping.is_branch("trunk/lib"):
+            self.assertEqual([oldrepos.generate_revision_id(1, "trunk/lib", mapping), oldrepos.generate_revision_id(2, "branches/mybranch", mapping)], 
+                             branch.revision_history())
+        else:
+            self.assertEqual([oldrepos.generate_revision_id(2, "branches/mybranch", mapping)], 
+                             branch.revision_history())
 
     def test_fetch_dir_from_non_branch(self):
         repos_url = self.make_repository('d')