/brz/remove-bazaar : contents of bzrlib/tests/blackbox/test

: (revision 5200.3.5)

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

4988.10.5 by John Arbash Meinel Merge bzr.dev 5021 to resolve NEWS	1	# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	2	#
	3	# This program is free software; you can redistribute it and/or modify
	4	# it under the terms of the GNU General Public License as published by
	5	# the Free Software Foundation; either version 2 of the License, or
	6	# (at your option) any later version.
	7	#
	8	# This program is distributed in the hope that it will be useful,
	9	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	# GNU General Public License for more details.
	12	#
	13	# You should have received a copy of the GNU General Public License
	14	# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob update FSF mailing address	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	16	#
	17
	18	"""Tests of the 'bzr add' command."""
	19
	20	import os
	21
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	22	from bzrlib import (
	23	osutils,
	24	tests,
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	25	)
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	26
	27
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	28	def load_tests(standard_tests, module, loader):
	29	"""Parameterize tests for view-aware vs not."""
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	30	to_adapt, result = tests.split_suite_by_condition(
	31	standard_tests, tests.condition_isinstance(TestAdd))
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	32	scenarios = [
	33	('pre-views', {'branch_tree_format': 'pack-0.92'}),
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)	34	('view-aware', {'branch_tree_format': 'development6-rich-root'}),
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	35	]
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	36	return tests.multiply_tests(to_adapt, scenarios, result)
	37
	38
	39	class TestAdd(tests.TestCaseWithTransport):
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	40
4163.2.1 by Ian Clatworthy Fix add in trees supports views	41	def make_branch_and_tree(self, dir):
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	42	return super(TestAdd, self).make_branch_and_tree(
	43	dir, format=self.branch_tree_format)
4163.2.1 by Ian Clatworthy Fix add in trees supports views	44
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	45	def test_add_reports(self):
	46	"""add command prints the names of added files."""
2664.3.1 by Daniel Watkins tests.blackbox.test_add now uses internals where appropriate.	47	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	48	self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
1765.1.1 by Robert Collins Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.	49	self.build_tree_contents([('.bzrignore', 'CVS\n')])
2581.1.2 by Martin Pool Remove unnecessary retcode=0 to run_bzr calls	50	out = self.run_bzr('add')[0]
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	51	# the ordering is not defined at the moment
	52	results = sorted(out.rstrip('\n').split('\n'))
4595.1.1 by Jason Spashett Further tweaks to bzr add	53	self.assertEquals(['adding .bzrignore',
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	54	'adding dir',
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	55	'adding dir/sub.txt',
4595.1.1 by Jason Spashett Further tweaks to bzr add	56	'adding top.txt'],
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	57	results)
2581.1.2 by Martin Pool Remove unnecessary retcode=0 to run_bzr calls	58	out = self.run_bzr('add -v')[0]
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	59	results = sorted(out.rstrip('\n').split('\n'))
4595.1.1 by Jason Spashett Further tweaks to bzr add	60	self.assertEquals(['ignored CVS matching "CVS"'],
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	61	results)
	62
	63	def test_add_quiet_is(self):
	64	"""add -q does not print the names of added files."""
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	65	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	66	self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
2581.1.2 by Martin Pool Remove unnecessary retcode=0 to run_bzr calls	67	out = self.run_bzr('add -q')[0]
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	68	# the ordering is not defined at the moment
	69	results = sorted(out.rstrip('\n').split('\n'))
	70	self.assertEquals([''], results)
	71
	72	def test_add_in_unversioned(self):
	73	"""Try to add a file in an unversioned directory.
	74
	75	"bzr add" should add the parent(s) as necessary.
	76	"""
2664.3.1 by Daniel Watkins tests.blackbox.test_add now uses internals where appropriate.	77	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	78	self.build_tree(['inertiatic/', 'inertiatic/esp'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	79	self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	80	self.run_bzr('add inertiatic/esp')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	81	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	82
	83	# Multiple unversioned parents
	84	self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	85	self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	86	self.run_bzr('add veil/cerpin/taxt')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	87	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	88
	89	# Check whacky paths work
	90	self.build_tree(['cicatriz/', 'cicatriz/esp'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	91	self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	92	self.run_bzr('add inertiatic/../cicatriz/esp')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	93	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	94
	95	def test_add_in_versioned(self):
	96	"""Try to add a file in a versioned directory.
	97
	98	"bzr add" should do this happily.
	99	"""
2664.3.1 by Daniel Watkins tests.blackbox.test_add now uses internals where appropriate.	100	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	101	self.build_tree(['inertiatic/', 'inertiatic/esp'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	102	self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	103	self.run_bzr('add --no-recurse inertiatic')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	104	self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	105	self.run_bzr('add inertiatic/esp')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	106	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	107
	108	def test_subdir_add(self):
	109	"""Add in subdirectory should add only things from there down"""
	110	from bzrlib.workingtree import WorkingTree
1836.1.16 by John Arbash Meinel Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.	111
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	112	eq = self.assertEqual
1836.1.16 by John Arbash Meinel Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.	113	ass = self.assertTrue
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	114
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	115	t = self.make_branch_and_tree('.')
	116	b = t.branch
	117	self.build_tree(['src/', 'README'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	118
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	119	eq(sorted(t.unknowns()),
	120	['README', 'src'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	121
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	122	self.run_bzr('add src')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	123
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	124	self.build_tree(['src/foo.c'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	125
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	126	# add with no arguments in a subdirectory gets only files below that
	127	# subdirectory
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	128	self.run_bzr('add', working_dir='src')
	129	self.assertEquals('README\n',
	130	self.run_bzr('unknowns', working_dir='src')[0])
2255.2.176 by Martin Pool Merge dirstate and some small cleanups	131	# reopen to see the new changes
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	132	t = t.bzrdir.open_workingtree('src')
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	133	versioned = [path for path, entry in t.iter_entries_by_dir()]
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	134	self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	135
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	136	# add from the parent directory should pick up all file names
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	137	self.run_bzr('add')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	138	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	139	self.run_bzr('check')
1757.2.1 by Robert Collins Add an explicit test that adding a missing file barfs.	140
	141	def test_add_missing(self):
	142	"""bzr add foo where foo is missing should error."""
	143	self.make_branch_and_tree('.')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	144	self.run_bzr('add missing-file', retcode=3)
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	145
	146	def test_add_from(self):
	147	base_tree = self.make_branch_and_tree('base')
	148	self.build_tree(['base/a', 'base/b/', 'base/b/c'])
	149	base_tree.add(['a', 'b', 'b/c'])
	150	base_tree.commit('foo')
	151
	152	new_tree = self.make_branch_and_tree('new')
	153	self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
	154
	155	os.chdir('new')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	156	out, err = self.run_bzr('add --file-ids-from ../base')
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	157	self.assertEqual('', err)
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	158	self.assertEqualDiff('adding a w/ file id from a\n'
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	159	'adding b w/ file id from b\n'
4075.1.1 by Robert Collins add should not print 'add completed' unnecessarily.	160	'adding b/c w/ file id from b/c\n',
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	161	out)
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	162	new_tree = new_tree.bzrdir.open_workingtree()
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	163	self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
	164	self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
	165	self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
	166
	167	def test_add_from_subdir(self):
	168	base_tree = self.make_branch_and_tree('base')
	169	self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
	170	base_tree.add(['a', 'b', 'b/c', 'b/d'])
	171	base_tree.commit('foo')
	172
	173	new_tree = self.make_branch_and_tree('new')
	174	self.build_tree(['new/c', 'new/d'])
	175
	176	os.chdir('new')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	177	out, err = self.run_bzr('add --file-ids-from ../base/b')
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	178	self.assertEqual('', err)
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	179	self.assertEqualDiff('adding c w/ file id from b/c\n'
4075.1.1 by Robert Collins add should not print 'add completed' unnecessarily.	180	'adding d w/ file id from b/d\n',
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	181	out)
	182
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	183	new_tree = new_tree.bzrdir.open_workingtree()
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	184	self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
	185	self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
1928.1.1 by Alexander Belchenko blackbox test for 'bzr add --dry-run'	186
	187	def test_add_dry_run(self):
2568.2.4 by Robert Collins * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now	188	"""Test a dry run add, make sure nothing is added."""
	189	wt = self.make_branch_and_tree('.')
	190	self.build_tree(['inertiatic/', 'inertiatic/esp'])
	191	self.assertEqual(list(wt.unknowns()), ['inertiatic'])
	192	self.run_bzr('add --dry-run')
	193	self.assertEqual(list(wt.unknowns()), ['inertiatic'])
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	194
	195	def test_add_control_dir(self):
	196	"""The control dir and its content should be refused."""
2279.6.1 by Alexander Belchenko Instead of __str__ method for FastPath object we use .raw_path attribute (note from Aaron).	197	self.make_branch_and_tree('.')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	198	err = self.run_bzr('add .bzr', retcode=3)[1]
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	199	self.assertContainsRe(err, r'ERROR:.\.bzr.control file')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	200	err = self.run_bzr('add .bzr/README', retcode=3)[1]
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	201	self.assertContainsRe(err, r'ERROR:.\.bzr.control file')
	202	self.build_tree(['.bzr/crescent'])
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	203	err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	204	self.assertContainsRe(err, r'ERROR:.\.bzr.control file')
2617.5.3 by Kuno Meyer Blackbox test for adding with wildcards (Win32).	205
4301.1.1 by Geoff Bache Fixing bug 183831, where 'bzr add' fails with a python stack if the path contains a symbolic link	206	def test_add_via_symlink(self):
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	207	self.requireFeature(tests.SymlinkFeature)
4301.1.1 by Geoff Bache Fixing bug 183831, where 'bzr add' fails with a python stack if the path contains a symbolic link	208	self.make_branch_and_tree('source')
	209	self.build_tree(['source/top.txt'])
	210	os.symlink('source', 'link')
	211	out = self.run_bzr(['add', 'link/top.txt'])[0]
	212	self.assertEquals(out, 'adding top.txt\n')
	213
	214	def test_add_symlink_to_abspath(self):
5012.1.1 by Vincent Ladeuil Fix imports in blackbox/test_add.py.	215	self.requireFeature(tests.SymlinkFeature)
4301.2.4 by Aaron Bentley Further cleanups	216	self.make_branch_and_tree('tree')
	217	os.symlink(osutils.abspath('target'), 'tree/link')
	218	out = self.run_bzr(['add', 'tree/link'])[0]
4301.1.1 by Geoff Bache Fixing bug 183831, where 'bzr add' fails with a python stack if the path contains a symbolic link	219	self.assertEquals(out, 'adding link\n')