Rev 2818: Clean up test_ignored, add test_unknowns (Daniel Watkins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Sep 13 20:33:19 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2818
revision-id: pqm at pqm.ubuntu.com-20070913193317-hi3rhwxhbrviw7hz
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
parent: abentley at panoramicfeedback.com-20070913183122-p0s7t241mh4748qr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-13 20:33:17 +0100
message:
Clean up test_ignored, add test_unknowns (Daniel Watkins)
added:
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
modified:
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 2817.1.1
merged: abentley at panoramicfeedback.com-20070913183122-p0s7t241mh4748qr
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
parent: d.m.watkins at warwick.ac.uk-20070905015407-ryd91uirbw58fiei
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-09-13 14:31:22 -0400
message:
merge from Daniel
------------------------------------------------------------
revno: 2795.2.2
merged: d.m.watkins at warwick.ac.uk-20070905015407-ryd91uirbw58fiei
parent: d.m.watkins at warwick.ac.uk-20070905013834-mkd7qh0z8xco253m
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: fix_blackbox_test_i
timestamp: Wed 2007-09-05 02:54:07 +0100
message:
Added tests.blackbox.test_unknowns.
------------------------------------------------------------
revno: 2795.2.1
merged: d.m.watkins at warwick.ac.uk-20070905013834-mkd7qh0z8xco253m
parent: pqm at pqm.ubuntu.com-20070905001648-0iigag4tq1u8mywn
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: fix_blackbox_test_i
timestamp: Wed 2007-09-05 02:38:34 +0100
message:
Updated tests in tests.blackbox.test_ignore to use bzr internals where appropriate.
=== added file 'bzrlib/tests/blackbox/test_unknowns.py'
--- a/bzrlib/tests/blackbox/test_unknowns.py 1970-01-01 00:00:00 +0000
+++ b/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'
--- a/bzrlib/tests/blackbox/__init__.py 2007-08-16 18:23:13 +0000
+++ b/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'
--- a/bzrlib/tests/blackbox/test_ignore.py 2007-08-29 09:48:37 +0000
+++ b/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')
More information about the bazaar-commits
mailing list