Rev 1492: Fix last push test. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1492
revision-id: jelmer at samba.org-20080723004804-ix01c0x2a7dccg0e
parent: jelmer at samba.org-20080723003707-4nci8v53w0e3yob8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-07-23 02:48:04 +0200
message:
  Fix last push test.
modified:
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
=== modified file 'tests/test_push.py'
--- a/tests/test_push.py	2008-07-19 13:17:41 +0000
+++ b/tests/test_push.py	2008-07-23 00:48:04 +0000
@@ -788,7 +788,8 @@
         registry.open_file("branches/foo/registry/generic.c").modify("France")
         dc.close()
 
-        merge_revno = ra.RemoteAccess(repos_url).get_latest_revnum()
+        r = ra.RemoteAccess(repos_url)
+        merge_revno = r.get_latest_revnum()
         merge_revid = newdir.find_repository().generate_revision_id(merge_revno, "branches/foo", mapping)
 
         self.build_tree({'c/registry/generic.c': "de"})
@@ -805,7 +806,7 @@
         self.assertEquals([revid1, revid2, revid3], trunk.revision_history())
         self.assertEquals(
                 '1 initialrevid\n2 changerevid\n3 mergerevid\n',
-                self.client_get_prop(repos_url+"/branches/foo", SVN_PROP_BZR_REVISION_ID+"trunk0"))
+                self.client_get_prop(repos_url+"/branches/foo", SVN_PROP_BZR_REVISION_ID+"trunk0", r.get_latest_revnum()))
 
     def test_complex_replace_dir(self):
         repos_url = self.make_repository("a")