Rev 2249: merge status false-failure fix from dev in http://sourcefrog.net/bzr/tags

Martin Pool mbp at sourcefrog.net
Thu Feb 22 03:05:34 GMT 2007


At http://sourcefrog.net/bzr/tags

------------------------------------------------------------
revno: 2249
revision-id: mbp at sourcefrog.net-20070222030533-4e9nxag9ykjffq3s
parent: mbp at sourcefrog.net-20070222030454-qbli35zu25vq59q2
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 14:05:33 +1100
message:
  merge status false-failure fix from dev
modified:
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
    ------------------------------------------------------------
    revno: 2220.1.77
    merged: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
    parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
    parent: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-02-21 20:08:18 +0000
    message:
      (mbp,r=robert,trivial) make status blackbox tests pass on wide terminals
    ------------------------------------------------------------
    revno: 2220.1.76.1.1
    merged: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
    parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Wed 2007-02-21 18:59:17 +1100
    message:
      Make tests for truncation of status output more robust on wide terminals.
      
      (Relates to bug #56011)
=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- a/bzrlib/tests/blackbox/test_status.py	2007-02-06 14:02:32 +0000
+++ b/bzrlib/tests/blackbox/test_status.py	2007-02-21 07:59:17 +0000
@@ -143,17 +143,17 @@
         wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
         merge(["./branch", -1], [None, None], this_dir = './copy')
         message = self.status_string(wt2)
-        self.assert_(message.startswith("pending merges:\n"))
-        self.assert_(message.endswith("Empty commit 2\n")) 
+        self.assertStartsWith(message, "pending merges:\n")
+        self.assertEndsWith(message, "Empty commit 2\n")
         wt2.commit("merged")
         # must be long to make sure we see elipsis at the end
-        wt.commit("Empty commit 3 " + 
-                   "blah blah blah blah " * 10)
+        wt.commit("Empty commit 3 " +
+                   "blah blah blah blah " * 100)
         merge(["./branch", -1], [None, None], this_dir = './copy')
         message = self.status_string(wt2)
-        self.assert_(message.startswith("pending merges:\n"))
+        self.assertStartsWith(message, "pending merges:\n")
         self.assert_("Empty commit 3" in message)
-        self.assert_(message.endswith("...\n")) 
+        self.assertEndsWith(message, "...\n")
 
     def test_branch_status_specific_files(self): 
         """Tests branch status with given specific files"""




More information about the bazaar-commits mailing list