/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/blackbox/test_status.py

  • Committer: Robert Collins
  • Date: 2008-07-30 07:52:22 UTC
  • mto: This revision was merged to the branch mainline in revision 3596.
  • Revision ID: robertc@robertcollins.net-20080730075222-azbmg0knc7u9mkpg
Create acceptance test for bug 150438.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
438
438
        b_tree.add('b')
439
439
        b_tree.commit('b')
440
440
 
441
 
        chdir('a')
442
 
        self.run_bzr('merge ../b')
443
 
        out, err = self.run_bzr('status --no-pending')
 
441
        self.run_bzr('merge ../b', working_dir='a')
 
442
        out, err = self.run_bzr('status --no-pending', working_dir='a')
444
443
        self.assertEquals(out, "added:\n  b\n")
445
444
 
446
445
 
447
 
 
448
446
class TestStatusEncodings(TestCaseWithTransport):
449
447
    
450
448
    def setUp(self):