python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-28 02:04:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Skip failing QPixmap/QT5 tests on Arch

Browse Source
This commit is contained in:
Eric Soroos 2017-02-20 08:49:44 -08:00
parent 9b82bdbb10
commit 1b94ff81fe
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/helper.py
View File

@ -253,6 +253,12 @@ if sys.platform == 'win32':
else: else:
IMCONVERT = 'convert' IMCONVERT = 'convert'
def distro():
if os.path.exists('/etc/os-release'):
with open('/etc/os-release', 'r') as f:
for line in f:
if 'ID=' in line:
return line.strip().split('=')[1]
class cached_property(object): class cached_property(object):
def __init__(self, func): def __init__(self, func):

5
Tests/test_image_fromqpixmap.py
View File

@ -1,9 +1,10 @@
from helper import unittest, PillowTestCase, hopper from helper import unittest, PillowTestCase, hopper, distro
from test_imageqt import PillowQtTestCase, PillowQPixmapTestCase from test_imageqt import PillowQtTestCase, PillowQPixmapTestCase
from PIL import ImageQt from PIL import ImageQt
@unittest.skipIf(ImageQt.qt_version == '5' and distro() == 'arch',
"Topixmap fails on Arch + QT5")
class TestFromQPixmap(PillowQPixmapTestCase, PillowTestCase): class TestFromQPixmap(PillowQPixmapTestCase, PillowTestCase):
def roundtrip(self, expected): def roundtrip(self, expected):

4
Tests/test_image_toqpixmap.py
View File

@ -1,4 +1,4 @@
from helper import unittest, PillowTestCase, hopper from helper import unittest, PillowTestCase, hopper, distro
from test_imageqt import PillowQtTestCase, PillowQPixmapTestCase from test_imageqt import PillowQtTestCase, PillowQPixmapTestCase
from PIL import ImageQt from PIL import ImageQt
@ -9,6 +9,8 @@ if ImageQt.qt_is_installed:
class TestToQPixmap(PillowQPixmapTestCase, PillowTestCase): class TestToQPixmap(PillowQPixmapTestCase, PillowTestCase):
@unittest.skipIf(ImageQt.qt_version == '5' and distro() == 'arch',
"Topixmap fails on Arch + QT5")
def test_sanity(self): def test_sanity(self):
PillowQtTestCase.setUp(self) PillowQtTestCase.setUp(self)