Rev 4467: Finish cleanup. in file:///home/vila/src/bzr/bugs/206577-send-strict/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/206577-send-strict/

------------------------------------------------------------
revno: 4467
revision-id: v.ladeuil+lp at free.fr-20090626153640-ay59jpmdn1u07xtq
parent: v.ladeuil+lp at free.fr-20090626082013-l5isydqmlj0qqs4s
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 206577-send-strict
timestamp: Fri 2009-06-26 17:36:40 +0200
message:
  Finish cleanup.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py	2009-06-26 08:20:13 +0000
+++ b/bzrlib/tests/blackbox/test_send.py	2009-06-26 15:36:40 +0000
@@ -28,11 +28,6 @@
 from bzrlib.bundle import serializer
 
 
-def read_bundle(fileobj):
-    md = merge_directive.MergeDirective.from_lines(fileobj.readlines())
-    return serializer.read_bundle(StringIO(md.get_raw_bundle()))
-
-
 class TestSend(tests.TestCaseWithTransport):
 
     def setUp(self):
@@ -60,13 +55,9 @@
         out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
         return merge_directive.MergeDirective.from_lines(out.readlines())
 
-    def get_bundle(self, args, cmd=None, wd='branch'):
+    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
         md = self.get_MD(args, cmd=cmd, wd=wd)
-        return serializer.read_bundle(StringIO(md.get_raw_bundle()))
-
-    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
-        out = self.run_send(args, cmd=cmd, wd=wd)[0]
-        br = read_bundle(StringIO(out))
+        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
         self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
 
     def assertFormatIs(self, fmt_string, md):