Rev 5088: (mbp, for ajeans) better tests for status in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5088 [merge]
revision-id: pqm at pqm.ubuntu.com-20100313005423-zi688149jc260xvl
parent: pqm at pqm.ubuntu.com-20100312143405-ln4h5ph0hut5iicf
parent: arnaud.jeansen at gmail.com-20100307110404-4skj3pgo9ag0i3cq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2010-03-13 00:54:23 +0000
message:
  (mbp, for ajeans) better tests for status
modified:
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- a/bzrlib/tests/blackbox/test_status.py	2010-03-02 22:25:58 +0000
+++ b/bzrlib/tests/blackbox/test_status.py	2010-03-13 00:54:23 +0000
@@ -596,11 +596,28 @@
         result2 = self.run_bzr("status -SV -r 0..")[0]
         self.assertEquals(result2, result)
 
-    def assertStatusContains(self, pattern):
+    def assertStatusContains(self, pattern, short=False):
         """Run status, and assert it contains the given pattern"""
-        result = self.run_bzr("status --short")[0]
+        if short:
+            result = self.run_bzr("status --short")[0]
+        else:
+            result = self.run_bzr("status")[0]
         self.assertContainsRe(result, pattern)
 
+    def test_kind_change_plain(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['file'])
+        tree.add('file')
+        tree.commit('added file')
+        unlink('file')
+        self.build_tree(['file/'])
+        self.assertStatusContains('kind changed:\n  file \(file => directory\)')
+        tree.rename_one('file', 'directory')
+        self.assertStatusContains('renamed:\n  file/ => directory/\n' \
+                                  'modified:\n  directory/\n')
+        rmdir('directory')
+        self.assertStatusContains('removed:\n  file\n')
+
     def test_kind_change_short(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree(['file'])
@@ -608,11 +625,14 @@
         tree.commit('added file')
         unlink('file')
         self.build_tree(['file/'])
-        self.assertStatusContains('K  file => file/')
+        self.assertStatusContains('K  file => file/',
+                                   short=True)
         tree.rename_one('file', 'directory')
-        self.assertStatusContains('RK  file => directory/')
+        self.assertStatusContains('RK  file => directory/',
+                                   short=True)
         rmdir('directory')
-        self.assertStatusContains('RD  file => directory')
+        self.assertStatusContains('RD  file => directory',
+                                   short=True)
 
     def test_status_illegal_revision_specifiers(self):
         out, err = self.run_bzr('status -r 1..23..123', retcode=3)