]> granicus.if.org Git - python/commitdiff
Issue #27312: Fix TypeError in test_setupapp
authorBerker Peksag <berker.peksag@gmail.com>
Sat, 18 Jun 2016 01:18:24 +0000 (04:18 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Sat, 18 Jun 2016 01:18:24 +0000 (04:18 +0300)
Lib/idlelib/idle_test/test_macosx.py

index 189dc486ca288e14f83f1526430e2b84cb92698e..3c6161c5182bfb1606b32e30da18a28ac05f4e61 100644 (file)
@@ -84,7 +84,7 @@ class SetupTest(unittest.TestCase):
         del cls.root
 
     @mock.patch('idlelib.macosx.overrideRootMenu')  #27312
-    def test_setupapp(self):
+    def test_setupapp(self, overrideRootMenu):
         "Call setupApp with each possible graphics type."
         root = self.root
         flist = FileList(root)
@@ -92,6 +92,9 @@ class SetupTest(unittest.TestCase):
             with self.subTest(tktype=tktype):
                 macosx._tk_type = tktype
                 macosx.setupApp(root, flist)
+                if tktype in ('carbon', 'cocoa'):
+                    self.assertTrue(overrideRootMenu.called)
+                overrideRootMenu.reset_mock()
 
 
 if __name__ == '__main__':