← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_submit.py

  • Committer: Aaron Bentley
  • Date: 2007-07-17 13:27:14 UTC
  • mfrom: (2624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_submit.py
59
59
 
60
60
    def test_uses_submit(self):
61
61
        """Submit location can be used and set"""
62
 
        self.make_trees()        
 
62
        self.make_trees()
63
63
        os.chdir('branch')
64
64
        br = read_bundle(StringIO(self.run_bzr('submit')[0]))
65
65
        self.assertRevisions(br, ['revision3'])
79
79
                              '--remember requires a branch to be specified.')
80
80
 
81
81
    def test_revision_branch_interaction(self):
82
 
        self.make_trees()        
 
82
        self.make_trees()
83
83
        os.chdir('branch')
84
 
        bi = read_bundle(StringIO(self.run_bzr('bundle', '../grandparent')[0]))
 
84
        bi = read_bundle(StringIO(self.run_bzr('bundle ../grandparent')[0]))
85
85
        self.assertRevisions(bi, ['revision3', 'revision2'])
86
86
        out = StringIO(self.run_bzr('submit ../grandparent -r -2')[0])
87
87
        bi = read_bundle(out)
149
149
        md_file = open('file1', 'rb')
150
150
        self.addCleanup(md_file.close)
151
151
        self.assertContainsRe(md_file.read(), 'revision3')
 
152