Rev 3606: Andrew's review feedback. in http://people.ubuntu.com/~robertc/baz2.0/3117

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/3117

------------------------------------------------------------
revno: 3606
revision-id: robertc at robertcollins.net-20080805000619-bfje55v540epfkvr
parent: robertc at robertcollins.net-20080804224118-pgxd6gg6a54luvrv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 3117
timestamp: Tue 2008-08-05 10:06:19 +1000
message:
  Andrew's review feedback.
modified:
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py	2008-08-04 07:29:51 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2008-08-05 00:06:19 +0000
@@ -339,7 +339,7 @@
         out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
         self.assertFalse('added b' in out)
         self.assertFalse('added b' in err)
-        # If b was ignored it will still be 'added' in status.
+        # If b was excluded it will still be 'added' in status.
         out, err = self.run_bzr(['added'])
         self.assertEqual('b\n', out)
         self.assertEqual('', err)
@@ -354,9 +354,10 @@
         self.assertFalse('added c' in out)
         self.assertFalse('added b' in err)
         self.assertFalse('added c' in err)
-        # If b was ignored it will still be 'added' in status.
+        # If b was excluded it will still be 'added' in status.
         out, err = self.run_bzr(['added'])
-        self.assertEqual('b\nc\n', out)
+        self.assertTrue('b\n' in out)
+        self.assertTrue('c\n' in out)
         self.assertEqual('', err)
 
     def test_commit_respects_spec_for_removals(self):

=== modified file 'bzrlib/tests/workingtree_implementations/test_commit.py'
--- a/bzrlib/tests/workingtree_implementations/test_commit.py	2008-08-04 22:07:34 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_commit.py	2008-08-05 00:06:19 +0000
@@ -221,7 +221,7 @@
         self.build_tree(['a', 'b', 'c'])
         tree.smart_add(['.'])
         tree.commit('test', exclude=['b', 'c'])
-        # If b was ignored it will still be 'added' in status.
+        # If b was excluded it will still be 'added' in status.
         tree.lock_read()
         self.addCleanup(tree.unlock)
         changes = list(tree.iter_changes(tree.basis_tree()))
@@ -234,7 +234,7 @@
         self.build_tree(['a/', 'a/b'])
         tree.smart_add(['.'])
         tree.commit('test', exclude=['a/b'])
-        # If a/b was ignored it will still be 'added' in status.
+        # If a/b was excluded it will still be 'added' in status.
         tree.lock_read()
         self.addCleanup(tree.unlock)
         changes = list(tree.iter_changes(tree.basis_tree()))