summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorE-Paine <63801254+E-Paine@users.noreply.github.com>2021-12-26 11:28:24 +0000
committerGitHub <noreply@github.com>2021-12-26 13:28:24 +0200
commit2e3e0d23adca8d83722d939d6abd1e467d7578f7 (patch)
treea403a686b74314ad087a4a713f678f3f4af97412
parentad4857884b4821fc2c9bd23b63d03f9570eb03d1 (diff)
downloadcpython-git-2e3e0d23adca8d83722d939d6abd1e467d7578f7.tar.gz
bpo-45496: Allow flexibility in winfo_rgb tests (GH-30185)
-rw-r--r--Lib/tkinter/test/test_tkinter/test_misc.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_misc.py b/Lib/tkinter/test/test_tkinter/test_misc.py
index 2c78eaca2c..044eb10d68 100644
--- a/Lib/tkinter/test/test_tkinter/test_misc.py
+++ b/Lib/tkinter/test/test_tkinter/test_misc.py
@@ -201,6 +201,13 @@ class MiscTest(AbstractTkTest, unittest.TestCase):
root.clipboard_get()
def test_winfo_rgb(self):
+
+ def assertApprox(col1, col2):
+ # A small amount of flexibility is required (bpo-45496)
+ # 33 is ~0.05% of 65535, which is a reasonable margin
+ for col1_channel, col2_channel in zip(col1, col2):
+ self.assertAlmostEqual(col1_channel, col2_channel, delta=33)
+
root = self.root
rgb = root.winfo_rgb
@@ -210,9 +217,9 @@ class MiscTest(AbstractTkTest, unittest.TestCase):
# #RGB - extends each 4-bit hex value to be 16-bit.
self.assertEqual(rgb('#F0F'), (0xFFFF, 0x0000, 0xFFFF))
# #RRGGBB - extends each 8-bit hex value to be 16-bit.
- self.assertEqual(rgb('#4a3c8c'), (0x4a4a, 0x3c3c, 0x8c8c))
+ assertApprox(rgb('#4a3c8c'), (0x4a4a, 0x3c3c, 0x8c8c))
# #RRRRGGGGBBBB
- self.assertEqual(rgb('#dede14143939'), (0xdede, 0x1414, 0x3939))
+ assertApprox(rgb('#dede14143939'), (0xdede, 0x1414, 0x3939))
# Invalid string.
with self.assertRaises(tkinter.TclError):
rgb('#123456789a')