← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
56
56
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
57
57
        os.chdir('../branch')
58
58
        stdout, stderr = self.run_bzr('send -o-')
59
 
        self.assertEqual(stderr.count('Using saved location'), 1)
 
59
        self.assertEqual(stderr.count('Using saved parent location'), 1)
60
60
        br = read_bundle(StringIO(stdout))
61
61
        self.assertRevisions(br, ['revision3'])
62
62
 
68
68
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
69
69
        os.chdir('../branch')
70
70
        stdout, stderr = self.run_bzr('bundle')
71
 
        self.assertEqual(stderr.count('Using saved location'), 1)
 
71
        self.assertEqual(stderr.count('Using saved parent location'), 1)
72
72
        br = read_bundle(StringIO(stdout))
73
73
        self.assertRevisions(br, ['revision3'])
74
74