/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-02-28 10:08:29 UTC
  • mto: This revision was merged to the branch mainline in revision 5062.
  • Revision ID: robertc@robertcollins.net-20100228100829-nroa3qp8zi8jwxke
* bzr now has a ``.testr.conf`` file in its source tree configured
  appropriately for running tests with Testrepository
  (``https://launchpad.net/testrepository``). (Robert Collins)

* Documentation about testing with ``subunit`` has been tweaked.
  (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_merge.py
34
34
        cmd = cmd_merge()
35
35
        # We don't care about the ouput but 'outf' should be defined
36
36
        cmd.outf = StringIOWrapper()
37
 
        cmd.run(self.get_url('branch1'), directory='branch2')
 
37
        cmd.run_direct(self.get_url('branch1'), directory='branch2')
38
38
        self.assertEquals(1, len(self.connections))
 
39