Rev 4486: (vila) Cleanup send tests in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jun 26 16:52:15 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4486 [merge]
revision-id: pqm at pqm.ubuntu.com-20090626155213-fr2l56hp7m5rzllt
parent: pqm at pqm.ubuntu.com-20090626104850-417m6hsh8btc8g0e
parent: v.ladeuil+lp at free.fr-20090626135434-alc2tyotiyfj4qvn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-26 16:52:13 +0100
message:
(vila) Cleanup send tests
modified:
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/blackbox/test_send.py 2009-06-26 08:20:13 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
# Authors: Aaron Bentley
#
# This program is free software; you can redistribute it and/or modify
@@ -16,17 +16,16 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-import os
import sys
-from StringIO import StringIO
+from cStringIO import StringIO
from bzrlib import (
- branch as _mod_branch,
+ branch,
+ bzrdir,
merge_directive,
+ tests,
)
from bzrlib.bundle import serializer
-from bzrlib.bzrdir import BzrDir
-from bzrlib import tests
def read_bundle(fileobj):
@@ -36,246 +35,225 @@
class TestSend(tests.TestCaseWithTransport):
- def make_trees(self):
- grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
+ def setUp(self):
+ super(TestSend, self).setUp()
+ grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
+ 'grandparent')
self.build_tree_contents([('grandparent/file1', 'grandparent')])
grandparent_tree.add('file1')
- grandparent_tree.commit('initial commit', rev_id='revision1')
+ grandparent_tree.commit('initial commit', rev_id='rev1')
+
parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
parent_tree = parent_bzrdir.open_workingtree()
- parent_tree.commit('next commit', rev_id='revision2')
+ parent_tree.commit('next commit', rev_id='rev2')
+
branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
self.build_tree_contents([('branch/file1', 'branch')])
- branch_tree.commit('last commit', rev_id='revision3')
+ branch_tree.commit('last commit', rev_id='rev3')
+
+ def run_send(self, args, cmd=None, rc=0, wd='branch'):
+ if cmd is None:
+ cmd = ['send', '-o-']
+ return self.run_bzr(cmd + args, retcode=rc, working_dir=wd)
+
+ def get_MD(self, args, cmd=None, wd='branch'):
+ out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
+ return merge_directive.MergeDirective.from_lines(out.readlines())
+
+ def get_bundle(self, args, cmd=None, wd='branch'):
+ md = self.get_MD(args, cmd=cmd, wd=wd)
+ return serializer.read_bundle(StringIO(md.get_raw_bundle()))
+
+ def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
+ out = self.run_send(args, cmd=cmd, wd=wd)[0]
+ br = read_bundle(StringIO(out))
+ self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
+
+ def assertFormatIs(self, fmt_string, md):
+ self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
def test_uses_parent(self):
"""Parent location is used as a basis by default"""
- self.make_trees()
- os.chdir('grandparent')
- errmsg = self.run_bzr('send -o-', retcode=3)[1]
+ errmsg = self.run_send([], rc=3, wd='grandparent')[1]
self.assertContainsRe(errmsg, 'No submit branch known or specified')
- os.chdir('../branch')
- stdout, stderr = self.run_bzr('send -o-')
+ stdout, stderr = self.run_send([])
self.assertEqual(stderr.count('Using saved parent location'), 1)
- br = read_bundle(StringIO(stdout))
- self.assertRevisions(br, ['revision3'])
+ self.assertBundleContains(['rev3'], [])
def test_bundle(self):
"""Bundle works like send, except -o is not required"""
- self.make_trees()
- os.chdir('grandparent')
- errmsg = self.run_bzr('bundle', retcode=3)[1]
+ errmsg = self.run_send([], cmd=['bundle'], rc=3, wd='grandparent')[1]
self.assertContainsRe(errmsg, 'No submit branch known or specified')
- os.chdir('../branch')
- stdout, stderr = self.run_bzr('bundle')
+ stdout, stderr = self.run_send([], cmd=['bundle'])
self.assertEqual(stderr.count('Using saved parent location'), 1)
- br = read_bundle(StringIO(stdout))
- self.assertRevisions(br, ['revision3'])
-
- def assertRevisions(self, bi, expected):
- self.assertEqual(set(r.revision_id for r in bi.revisions),
- set(expected))
+ self.assertBundleContains(['rev3'], [], cmd=['bundle'])
def test_uses_submit(self):
"""Submit location can be used and set"""
- self.make_trees()
- os.chdir('branch')
- br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
- self.assertRevisions(br, ['revision3'])
- br = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
- self.assertRevisions(br, ['revision3', 'revision2'])
+ self.assertBundleContains(['rev3'], [])
+ self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
# submit location should be auto-remembered
- br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
- self.assertRevisions(br, ['revision3', 'revision2'])
- self.run_bzr('send ../parent -o-')
- br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
- self.assertRevisions(br, ['revision3', 'revision2'])
- self.run_bzr('send ../parent --remember -o-')
- br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
- self.assertRevisions(br, ['revision3'])
- err = self.run_bzr('send --remember -o-', retcode=3)[1]
+ self.assertBundleContains(['rev3', 'rev2'], [])
+
+ self.run_send(['../parent'])
+ # We still point to ../grandparent
+ self.assertBundleContains(['rev3', 'rev2'], [])
+ # Remember parent now
+ self.run_send(['../parent', '--remember'])
+ # Now we point to parent
+ self.assertBundleContains(['rev3'], [])
+
+ err = self.run_send(['--remember'], rc=3)[1]
self.assertContainsRe(err,
'--remember requires a branch to be specified.')
def test_revision_branch_interaction(self):
- self.make_trees()
- os.chdir('branch')
- bi = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
- self.assertRevisions(bi, ['revision3', 'revision2'])
- out = StringIO(self.run_bzr('send ../grandparent -r -2 -o-')[0])
- bi = read_bundle(out)
- self.assertRevisions(bi, ['revision2'])
- sio = StringIO(self.run_bzr('send -r -2..-1 -o-')[0])
- md = merge_directive.MergeDirective.from_lines(sio.readlines())
- self.assertEqual('revision2', md.base_revision_id)
- self.assertEqual('revision3', md.revision_id)
- sio.seek(0)
- bi = read_bundle(sio)
- self.assertRevisions(bi, ['revision2', 'revision3'])
- self.run_bzr('send ../grandparent -r -2..-1 -o-')
+ self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
+ self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
+ self.assertBundleContains(['rev3', 'rev2'],
+ ['../grandparent', '-r-2..-1'])
+ md = self.get_MD(['-r-2..-1'])
+ self.assertEqual('rev2', md.base_revision_id)
+ self.assertEqual('rev3', md.revision_id)
def test_output(self):
# check output for consistency
# win32 stdout converts LF to CRLF,
# which would break patch-based bundles
- self.make_trees()
- os.chdir('branch')
- stdout = self.run_bzr_subprocess('send -o-')[0]
- br = read_bundle(StringIO(stdout))
- self.assertRevisions(br, ['revision3'])
+ self.assertBundleContains(['rev3'], [])
def test_no_common_ancestor(self):
foo = self.make_branch_and_tree('foo')
foo.commit('rev a')
bar = self.make_branch_and_tree('bar')
bar.commit('rev b')
- os.chdir('foo')
- self.run_bzr('send ../bar -o-')
-
- def send_directive(self, args):
- sio = StringIO(self.run_bzr(['send', '-o-'] + args)[0])
- return merge_directive.MergeDirective.from_lines(sio.readlines())
+ self.run_send(['--from', 'foo', '../bar'], wd='foo')
def test_content_options(self):
"""--no-patch and --no-bundle should work and be independant"""
- self.make_trees()
- os.chdir('branch')
- md = self.send_directive([])
- self.assertIsNot(None, md.bundle)
- self.assertIsNot(None, md.patch)
-
- md = self.send_directive(['--format=0.9'])
- self.assertIsNot(None, md.bundle)
- self.assertIsNot(None, md.patch)
-
- md = self.send_directive(['--no-patch'])
+ md = self.get_MD([])
+ self.assertIsNot(None, md.bundle)
+ self.assertIsNot(None, md.patch)
+
+ md = self.get_MD(['--format=0.9'])
+ self.assertIsNot(None, md.bundle)
+ self.assertIsNot(None, md.patch)
+
+ md = self.get_MD(['--no-patch'])
self.assertIsNot(None, md.bundle)
self.assertIs(None, md.patch)
self.run_bzr_error(['Format 0.9 does not permit bundle with no patch'],
- 'send --no-patch --format=0.9 -o-')
-
- md = self.send_directive(['--no-bundle', '.', '.'])
+ ['send', '--no-patch', '--format=0.9', '-o-'],
+ working_dir='branch')
+ md = self.get_MD(['--no-bundle', '.', '.'])
self.assertIs(None, md.bundle)
self.assertIsNot(None, md.patch)
- md = self.send_directive(['--no-bundle', '--format=0.9', '../parent',
+ md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
'.'])
self.assertIs(None, md.bundle)
self.assertIsNot(None, md.patch)
- md = self.send_directive(['--no-bundle', '--no-patch', '.', '.'])
+ md = self.get_MD(['--no-bundle', '--no-patch', '.', '.'])
self.assertIs(None, md.bundle)
self.assertIs(None, md.patch)
- md = self.send_directive(['--no-bundle', '--no-patch', '--format=0.9',
- '../parent', '.'])
+ md = self.get_MD(['--no-bundle', '--no-patch', '--format=0.9',
+ '../parent', '.'])
self.assertIs(None, md.bundle)
self.assertIs(None, md.patch)
def test_from_option(self):
- self.make_trees()
self.run_bzr('send', retcode=3)
- md = self.send_directive(['--from', 'branch'])
- self.assertEqual('revision3', md.revision_id)
- md = self.send_directive(['-f', 'branch'])
- self.assertEqual('revision3', md.revision_id)
+ md = self.get_MD(['--from', 'branch'])
+ self.assertEqual('rev3', md.revision_id)
+ md = self.get_MD(['-f', 'branch'])
+ self.assertEqual('rev3', md.revision_id)
def test_output_option(self):
- self.make_trees()
stdout = self.run_bzr('send -f branch --output file1')[0]
self.assertEqual('', stdout)
md_file = open('file1', 'rb')
self.addCleanup(md_file.close)
- self.assertContainsRe(md_file.read(), 'revision3')
+ self.assertContainsRe(md_file.read(), 'rev3')
stdout = self.run_bzr('send -f branch --output -')[0]
- self.assertContainsRe(stdout, 'revision3')
+ self.assertContainsRe(stdout, 'rev3')
def test_note_revisions(self):
- self.make_trees()
- stderr = self.run_bzr('send -f branch --output file1')[1]
- self.assertContainsRe(stderr, r'Bundling 1 revision\(s\).\n')
+ stderr = self.run_send([])[1]
+ self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
def test_mailto_option(self):
- self.make_trees()
- branch = _mod_branch.Branch.open('branch')
- branch.get_config().set_user_option('mail_client', 'editor')
+ b = branch.Branch.open('branch')
+ b.get_config().set_user_option('mail_client', 'editor')
self.run_bzr_error(
('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
), 'send -f branch')
- branch.get_config().set_user_option('mail_client', 'bogus')
- self.run_bzr('send -f branch -o-')
+ b.get_config().set_user_option('mail_client', 'bogus')
+ self.run_send([])
self.run_bzr_error(('Unknown mail client: bogus',),
'send -f branch --mail-to jrandom at example.org')
- branch.get_config().set_user_option('submit_to', 'jrandom at example.org')
+ b.get_config().set_user_option('submit_to', 'jrandom at example.org')
self.run_bzr_error(('Unknown mail client: bogus',),
'send -f branch')
def test_mailto_child_option(self):
"""Make sure that child_submit_to is used."""
- self.make_trees()
- branch = _mod_branch.Branch.open('branch')
- branch.get_config().set_user_option('mail_client', 'bogus')
- parent = _mod_branch.Branch.open('parent')
+ b = branch.Branch.open('branch')
+ b.get_config().set_user_option('mail_client', 'bogus')
+ parent = branch.Branch.open('parent')
parent.get_config().set_user_option('child_submit_to',
'somebody at example.org')
self.run_bzr_error(('Unknown mail client: bogus',),
'send -f branch')
def test_format(self):
- self.make_trees()
- s = StringIO(self.run_bzr('send -f branch -o- --format=4')[0])
- md = merge_directive.MergeDirective.from_lines(s.readlines())
+ md = self.get_MD(['--format=4'])
self.assertIs(merge_directive.MergeDirective2, md.__class__)
- s = StringIO(self.run_bzr('send -f branch -o- --format=0.9')[0])
- md = merge_directive.MergeDirective.from_lines(s.readlines())
- self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
- '# Bazaar revision bundle v0.9')
- s = StringIO(self.run_bzr('bundle -f branch -o- --format=0.9')[0])
- md = merge_directive.MergeDirective.from_lines(s.readlines())
- self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
- '# Bazaar revision bundle v0.9')
+ self.assertFormatIs('# Bazaar revision bundle v4', md)
+
+ md = self.get_MD(['--format=0.9'])
+ self.assertFormatIs('# Bazaar revision bundle v0.9', md)
+
+ md = self.get_MD(['--format=0.9'], cmd=['bundle'])
+ self.assertFormatIs('# Bazaar revision bundle v0.9', md)
self.assertIs(merge_directive.MergeDirective, md.__class__)
+
self.run_bzr_error(['Bad value .* for option .format.'],
'send -f branch -o- --format=0.999')[0]
def test_format_child_option(self):
- self.make_trees()
- parent = _mod_branch.Branch.open('parent')
- parent.get_config().set_user_option('child_submit_format', '4')
- s = StringIO(self.run_bzr('send -f branch -o-')[0])
- md = merge_directive.MergeDirective.from_lines(s.readlines())
+ parent_config = branch.Branch.open('parent').get_config()
+ parent_config.set_user_option('child_submit_format', '4')
+ md = self.get_MD([])
self.assertIs(merge_directive.MergeDirective2, md.__class__)
- parent.get_config().set_user_option('child_submit_format', '0.9')
- s = StringIO(self.run_bzr('send -f branch -o-')[0])
- md = merge_directive.MergeDirective.from_lines(s.readlines())
- self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
- '# Bazaar revision bundle v0.9')
- s = StringIO(self.run_bzr('bundle -f branch -o-')[0])
- md = merge_directive.MergeDirective.from_lines(s.readlines())
- self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
- '# Bazaar revision bundle v0.9')
+
+ parent_config.set_user_option('child_submit_format', '0.9')
+ md = self.get_MD([])
+ self.assertFormatIs('# Bazaar revision bundle v0.9', md)
+
+ md = self.get_MD([], cmd=['bundle'])
+ self.assertFormatIs('# Bazaar revision bundle v0.9', md)
self.assertIs(merge_directive.MergeDirective, md.__class__)
- parent.get_config().set_user_option('child_submit_format', '0.999')
+
+ parent_config.set_user_option('child_submit_format', '0.999')
self.run_bzr_error(["No such send format '0.999'"],
'send -f branch -o-')[0]
def test_message_option(self):
- self.make_trees()
self.run_bzr('send', retcode=3)
- md = self.send_directive(['--from', 'branch'])
+ md = self.get_MD([])
self.assertIs(None, md.message)
- md = self.send_directive(['--from', 'branch', '-m', 'my message'])
+ md = self.get_MD(['-m', 'my message'])
self.assertEqual('my message', md.message)
def test_omitted_revision(self):
- self.make_trees()
- md = self.send_directive(['-r-2..', '--from', 'branch'])
- self.assertEqual('revision2', md.base_revision_id)
- self.assertEqual('revision3', md.revision_id)
- md = self.send_directive(['-r..3', '--from', 'branch',
- 'grandparent'])
- self.assertEqual('revision1', md.base_revision_id)
- self.assertEqual('revision3', md.revision_id)
+ md = self.get_MD(['-r-2..'])
+ self.assertEqual('rev2', md.base_revision_id)
+ self.assertEqual('rev3', md.revision_id)
+ md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
+ self.assertEqual('rev1', md.base_revision_id)
+ self.assertEqual('rev3', md.revision_id)
def test_nonexistant_branch(self):
if sys.platform == "win32":
More information about the bazaar-commits
mailing list