From 5209b53e9689ce28dcd045f384633378d619718f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Wi=C5=9Bniewski?= <vuko@vuko.pl>
Date: Thu, 5 Nov 2020 16:18:52 +0100
Subject: [PATCH] convert IFDRational to tuples in tests

This fixes tests with Pillow version >= 7.2.0
---
 tests/s_test.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/s_test.py b/tests/s_test.py
index 5d105de..a7cad54 100644
--- a/tests/s_test.py
+++ b/tests/s_test.py
***************
*** 9,14 ****
--- 9,15 ----
  import time
  import unittest
  
+ import PIL
  from PIL import Image
  import piexif
  from piexif import _common, ImageIFD, ExifIFD, GPSIFD, TAGS, InvalidImageDataError
***************
*** 580,585 ****
--- 581,597 ----
  # test utility methods----------------------------------------------
  
      def _compare_value(self, v1, v2):
+         if isinstance(v2, PIL.TiffImagePlugin.IFDRational):
+             v2 = (v2.numerator, v2.denominator)
+         if isinstance(v2, tuple):
+             converted_v2 = []
+             for el in v2:
+                 if isinstance(el, PIL.TiffImagePlugin.IFDRational):
+                     converted_v2.append((el.numerator, el.denominator))
+                 else:
+                     converted_v2.append(el)
+             v2 = tuple(converted_v2)
+ 
          if type(v1) != type(v2):
              if isinstance(v1, tuple):
                  self.assertEqual(pack_byte(*v1), v2)
63553c001b1a4664ed'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/tests.scm'>
<input type='hidden' name='id' value='d1e77d69c1e04f402cec2e63553c001b1a4664ed'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d1e77d69c1e04f402cec2e63553c001b1a4664ed'>root</a>/<a href='/guix/log/gnu?id=d1e77d69c1e04f402cec2e63553c001b1a4664ed'>gnu</a>/<a href='/guix/log/gnu/installer?id=d1e77d69c1e04f402cec2e63553c001b1a4664ed'>installer</a>/<a href='/guix/log/gnu/installer/tests.scm?id=d1e77d69c1e04f402cec2e63553c001b1a4664ed'>tests.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/tests.scm?id=d1e77d69c1e04f402cec2e63553c001b1a4664ed&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-04-10 16:02:52 +0200'>2020-04-10</span></td><td><a href='/guix/commit/gnu/installer/tests.scm?id=475d48145d529be23d97b2bb92d2734365733bba'>installer: tests: Don't install to a CD/DVD.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/tests.scm (choose-partitioning): Use 'find' to select
the disk.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-26 11:53:50 +0100'>2020-03-26</span></td><td><a href='/guix/commit/gnu/installer/tests.scm?id=7a1a10dbd4ef2989ea1cac111849a36c567430e3'>installer: tests: Use a filter to select desktop-environments.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/tests.scm (choose-services): Turn desktop-environments list
into a choose-desktop-environment procedure. This way, it is easier to select
all desktop-environments or none, in the same way as choose-network-service?
and choose-network-management-tool? arguments.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-03-05 23:40:23 +0100'>2020-03-05</span></td><td><a href='/guix/commit/gnu/installer/tests.scm?id=ccb1a8c437fa40760899ae95f9d3f10ed7c8b41b'>tests: install: Add "gui-installed-os".</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/tests.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add it.
* gnu/tests/install.scm (run-install): Add #:gui-test.  Add (gnu
installer tests) to the marionette imported modules.  Honor GUI-TEST.
Check whether SCRIPT is true.
(%root-password, %syslog-conf): New variable.
(operating-system-with-console-syslog, gui-test-program)
(guided-installation-test): New procedures.
(%extra-packages, installation-os-for-gui-tests)
(%test-gui-installed-os): New variable.
</span></span></td><td>Ludovic Courtès</td></tr>