Commit 8a5baf6f authored by Serhiy Storchaka's avatar Serhiy Storchaka

Use more precise Tcl version checks in tests.

parent 99ba24ce
...@@ -1040,7 +1040,7 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase): ...@@ -1040,7 +1040,7 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase):
def test_paneconfigure_height(self): def test_paneconfigure_height(self):
p, b, c = self.create2() p, b, c = self.create2()
self.check_paneconfigure(p, b, 'height', 10, 10, self.check_paneconfigure(p, b, 'height', 10, 10,
stringify=tcl_version < (8, 5)) stringify=get_tk_patchlevel() < (8, 5, 11))
self.check_paneconfigure_bad(p, b, 'height', self.check_paneconfigure_bad(p, b, 'height',
'bad screen distance "badValue"') 'bad screen distance "badValue"')
...@@ -1088,7 +1088,7 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase): ...@@ -1088,7 +1088,7 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase):
def test_paneconfigure_width(self): def test_paneconfigure_width(self):
p, b, c = self.create2() p, b, c = self.create2()
self.check_paneconfigure(p, b, 'width', 10, 10, self.check_paneconfigure(p, b, 'width', 10, 10,
stringify=tcl_version < (8, 5)) stringify=get_tk_patchlevel() < (8, 5, 11))
self.check_paneconfigure_bad(p, b, 'width', self.check_paneconfigure_bad(p, b, 'width',
'bad screen distance "badValue"') 'bad screen distance "badValue"')
......
...@@ -352,7 +352,8 @@ class ComboboxTest(AbstractWidgetTest, unittest.TestCase): ...@@ -352,7 +352,8 @@ class ComboboxTest(AbstractWidgetTest, unittest.TestCase):
expected=('mon', 'tue', 'wed', 'thur')) expected=('mon', 'tue', 'wed', 'thur'))
self.checkParam(self.combo, 'values', ('mon', 'tue', 'wed', 'thur')) self.checkParam(self.combo, 'values', ('mon', 'tue', 'wed', 'thur'))
self.checkParam(self.combo, 'values', (42, 3.14, '', 'any string')) self.checkParam(self.combo, 'values', (42, 3.14, '', 'any string'))
self.checkParam(self.combo, 'values', '', expected=()) self.checkParam(self.combo, 'values', '',
expected='' if get_tk_patchlevel() < (8, 5, 10) else ())
self.combo['values'] = ['a', 1, 'c'] self.combo['values'] = ['a', 1, 'c']
...@@ -1125,7 +1126,8 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase): ...@@ -1125,7 +1126,8 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase):
self.checkParam(widget, 'columns', 'a b c', self.checkParam(widget, 'columns', 'a b c',
expected=('a', 'b', 'c')) expected=('a', 'b', 'c'))
self.checkParam(widget, 'columns', ('a', 'b', 'c')) self.checkParam(widget, 'columns', ('a', 'b', 'c'))
self.checkParam(widget, 'columns', ()) self.checkParam(widget, 'columns', (),
expected='' if get_tk_patchlevel() < (8, 5, 10) else ())
def test_displaycolumns(self): def test_displaycolumns(self):
widget = self.create() widget = self.create()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment