← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_pull.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-26 07:56:05 UTC
  • mfrom: (6165 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6170.
  • Revision ID: john@arbash-meinel.com-20110926075605-czuukdiawz68dpbd
Merge bzr.dev 6165, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_pull.py
54
54
        # We don't care about the ouput but 'outf' should be defined
55
55
        pull.outf = tests.StringIOWrapper()
56
56
        pull.run(self.get_url('remote'), directory='local')
57
 
        self.assertEquals(1, len(self.connections))
 
57
        self.assertEquals(2, len(self.connections))
58
58