[MERGE] Convert tests.blackbox.test_i* to use bzr internals and add tests.blackbox.test_unknowns
Daniel Watkins
D.M.Watkins at warwick.ac.uk
Wed Sep 5 03:02:45 BST 2007
Attached is a bundle doing pretty much what the subject says.
test_unknowns was added because I removed a lot of run_bzr('unknowns')
calls from test_ignore and noticed that it didn't have any/much
coverage.
--
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070905015407-\
# ryd91uirbw58fiei
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: e0b8850310eef54757ac68da28dc0f45d2edbca5
# timestamp: 2007-09-05 02:57:33 +0100
# base_revision_id: pqm at pqm.ubuntu.com-20070905001648-0iigag4tq1u8mywn
#
# Begin patch
=== added file 'bzrlib/tests/blackbox/test_unknowns.py'
--- bzrlib/tests/blackbox/test_unknowns.py 1970-01-01 00:00:00 +0000
+++ bzrlib/tests/blackbox/test_unknowns.py 2007-09-05 01:54:07 +0000
@@ -0,0 +1,46 @@
+# Copyright (C) 2007 Canonical Ltd
+# -*- coding: utf-8 -*-
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+"""Black-box tests for 'bzr unknowns', which shows unknown files."""
+
+from bzrlib.tests.blackbox import ExternalBase
+
+class TestUnknowns(ExternalBase):
+
+ def test_unknowns(self):
+ """Test that 'unknown' command reports unknown files"""
+
+ # in empty directory, no unknowns
+ tree = self.make_branch_and_tree('.')
+ self.assertEquals(self.run_bzr('unknowns')[0], '')
+
+ # single unknown file
+ self.build_tree_contents([('a', 'contents of a\n')])
+ self.assertEquals(self.run_bzr('unknowns')[0], 'a\n')
+
+ # multiple unknown files
+ self.build_tree(['b', 'c'])
+ self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\n')
+
+ # after add, file no longer shown
+ tree.add('a')
+ self.assertEquals(self.run_bzr('unknowns')[0], 'b\nc\n')
+
+ # after all added, none shown
+ tree.add(['b', 'c'])
+ self.assertEquals(self.run_bzr('unknowns')[0], '')
=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- bzrlib/tests/blackbox/__init__.py 2007-08-16 18:23:13 +0000
+++ bzrlib/tests/blackbox/__init__.py 2007-09-05 01:54:07 +0000
@@ -103,6 +103,7 @@
'bzrlib.tests.blackbox.test_testament',
'bzrlib.tests.blackbox.test_too_much',
'bzrlib.tests.blackbox.test_uncommit',
+ 'bzrlib.tests.blackbox.test_unknowns',
'bzrlib.tests.blackbox.test_update',
'bzrlib.tests.blackbox.test_upgrade',
'bzrlib.tests.blackbox.test_version',
=== modified file 'bzrlib/tests/blackbox/test_ignore.py'
--- bzrlib/tests/blackbox/test_ignore.py 2007-08-29 09:48:37 +0000
+++ bzrlib/tests/blackbox/test_ignore.py 2007-09-05 01:38:34 +0000
@@ -45,7 +45,7 @@
def test_ignore_absolutes(self):
"""'ignore' with an absolute path returns an error"""
- self.run_bzr('init')
+ self.make_branch_and_tree('.')
self.run_bzr_error(('bzr: ERROR: NAME_PATTERN should not '
'be an absolute path\n',),
'ignore /crud')
@@ -64,50 +64,50 @@
self.assertEquals(self.run_bzr('unknowns')[0], 'dir3\n')
def test_ignore_patterns(self):
- self.run_bzr('init')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ tree = self.make_branch_and_tree('.')
+
+ self.assertEquals(list(tree.unknowns()), [])
# is_ignored() will now create the user global ignore file
# if it doesn't exist, so make sure we ignore it in our tests
ignores._set_user_ignores(['*.tmp'])
self.build_tree_contents(
- [('foo.tmp', '.tmp files are ignored by default'),
- ])
- self.assertEquals(self.run_bzr('unknowns')[0], '')
-
- file('foo.c', 'wt').write('int main() {}')
- self.assertEquals(self.run_bzr('unknowns')[0], 'foo.c\n')
-
- self.run_bzr('add foo.c')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ [('foo.tmp', '.tmp files are ignored by default')])
+ self.assertEquals(list(tree.unknowns()), [])
+
+ self.build_tree_contents([('foo.c', 'int main() {}')])
+ self.assertEquals(list(tree.unknowns()), ['foo.c'])
+
+ tree.add('foo.c')
+ self.assertEquals(list(tree.unknowns()), [])
# 'ignore' works when creating the .bzrignore file
- file('foo.blah', 'wt').write('blah')
- self.assertEquals(self.run_bzr('unknowns')[0], 'foo.blah\n')
+ self.build_tree_contents([('foo.blah', 'blah')])
+ self.assertEquals(list(tree.unknowns()), ['foo.blah'])
self.run_bzr('ignore *.blah')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ self.assertEquals(list(tree.unknowns()), [])
self.check_file_contents('.bzrignore', '*.blah\n')
# 'ignore' works when then .bzrignore file already exists
- file('garh', 'wt').write('garh')
- self.assertEquals(self.run_bzr('unknowns')[0], 'garh\n')
+ self.build_tree_contents([('garh', 'garh')])
+ self.assertEquals(list(tree.unknowns()), ['garh'])
self.run_bzr('ignore garh')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ self.assertEquals(list(tree.unknowns()), [])
self.check_file_contents('.bzrignore', '*.blah\ngarh\n')
def test_ignore_multiple_arguments(self):
"""'ignore' works with multiple arguments"""
- self.run_bzr('init')
+ tree = self.make_branch_and_tree('.')
self.build_tree(['a','b','c','d'])
- self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\nd\n')
+ self.assertEquals(list(tree.unknowns()), ['a', 'b', 'c', 'd'])
self.run_bzr('ignore a b c')
- self.assertEquals(self.run_bzr('unknowns')[0], 'd\n')
+ self.assertEquals(list(tree.unknowns()), ['d'])
self.check_file_contents('.bzrignore', 'a\nb\nc\n')
def test_ignore_no_arguments(self):
"""'ignore' with no arguments returns an error"""
- self.run_bzr('init')
+ self.make_branch_and_tree('.')
self.run_bzr_error(('bzr: ERROR: ignore requires at least one '
'NAME_PATTERN or --old-default-rules\n',),
'ignore')
# Begin bundle
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070905/7c70c124/attachment-0001.pgp
More information about the bazaar
mailing list