[Python-checkins] cpython (merge 3.3 -> default): test_debug in test_tkinter/test_text no longer fails when wantobjects is false.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/4e2b69138ab9
changeset:   88190:4e2b69138ab9
parent:      88187:78fa6dc5cc21
parent:      88189:07f4c2c8badf
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Wed Dec 25 17:36:20 2013 +0200
summary:
  test_debug in test_tkinter/test_text no longer fails when wantobjects is false.

files:
  Lib/tkinter/test/test_tkinter/test_text.py |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/tkinter/test/test_tkinter/test_text.py b/Lib/tkinter/test/test_tkinter/test_text.py
--- a/Lib/tkinter/test/test_tkinter/test_text.py
+++ b/Lib/tkinter/test/test_tkinter/test_text.py
@@ -16,12 +16,13 @@
 
     def test_debug(self):
         text = self.text
+        wantobjects = self.root.wantobjects()
         olddebug = text.debug()
         try:
             text.debug(0)
-            self.assertEqual(text.debug(), 0)
+            self.assertEqual(text.debug(), 0 if wantobjects else '0')
             text.debug(1)
-            self.assertEqual(text.debug(), 1)
+            self.assertEqual(text.debug(), 1 if wantobjects else '1')
         finally:
             text.debug(olddebug)
             self.assertEqual(text.debug(), olddebug)

-- 
Repository URL: http://hg.python.org/cpython