[Tests] use absolute imports and add __init__.py where relevant

We can't use relative imports any more since the tests are now located outside the package.

I had to add __init__.py to Tests/feaLib/ so that pytest does not get confused by the presence
of two test files with the same basename: i.e. Tests/feaLib/builder_test.py and Tests/feaLib/builder_test.py

https://github.com/pytest-dev/pytest/issues/774
http://stackoverflow.com/questions/12582503/py-test-test-discovery-failure-when-tests-in-different-directories-are-called
This commit is contained in:
Cosimo Lupo 2017-01-15 21:45:57 +00:00
parent 78ad48eaf3
commit e1d340cc65
No known key found for this signature in database
GPG Key ID: B61AAAD0B53A6419
12 changed files with 13 additions and 12 deletions

0
Tests/feaLib/__init__.py Normal file
View File

View File

@ -1,7 +1,7 @@
from __future__ import print_function, division, absolute_import, unicode_literals from __future__ import print_function, division, absolute_import, unicode_literals
from fontTools.misc.py23 import * from fontTools.misc.py23 import *
import unittest import unittest
from .encodingTools import getEncoding from fontTools.misc.encodingTools import getEncoding
class EncodingTest(unittest.TestCase): class EncodingTest(unittest.TestCase):

View File

@ -5,7 +5,7 @@ import os
import tempfile import tempfile
import unittest import unittest
from fontTools.misc.textTools import deHexStr from fontTools.misc.textTools import deHexStr
from .macRes import ResourceReader from fontTools.misc.macRes import ResourceReader
# test resource data in DeRez notation # test resource data in DeRez notation

View File

@ -5,7 +5,7 @@ from fontTools.misc.py23 import *
import os import os
import unittest import unittest
from fontTools.ttLib import TTFont from fontTools.ttLib import TTFont
from .xmlReader import XMLReader, ProgressPrinter, BUFSIZE from fontTools.misc.xmlReader import XMLReader, ProgressPrinter, BUFSIZE
import tempfile import tempfile

View File

@ -2,7 +2,7 @@ from __future__ import print_function, division, absolute_import
from fontTools.misc.py23 import * from fontTools.misc.py23 import *
import os import os
import unittest import unittest
from .xmlWriter import XMLWriter from fontTools.misc.xmlWriter import XMLWriter
linesep = tobytes(os.linesep) linesep = tobytes(os.linesep)
HEADER = b'<?xml version="1.0" encoding="UTF-8"?>' + linesep HEADER = b'<?xml version="1.0" encoding="UTF-8"?>' + linesep

View File

@ -1,6 +1,6 @@
from __future__ import print_function, division, absolute_import from __future__ import print_function, division, absolute_import
from fontTools.ttLib import TTFont, newTable, getTableModule from fontTools.ttLib import TTFont, newTable, getTableModule
from .O_S_2f_2 import * from fontTools.ttLib.tables.O_S_2f_2 import *
import unittest import unittest

View File

@ -2,7 +2,7 @@ from __future__ import print_function, division, absolute_import, unicode_litera
from fontTools.misc.py23 import * from fontTools.misc.py23 import *
from fontTools import ttLib from fontTools import ttLib
import unittest import unittest
from ._c_m_a_p import CmapSubtable, table__c_m_a_p from fontTools.ttLib.tables._c_m_a_p import CmapSubtable, table__c_m_a_p
class CmapSubtableTest(unittest.TestCase): class CmapSubtableTest(unittest.TestCase):

View File

@ -2,7 +2,7 @@ from __future__ import print_function, absolute_import
from fontTools.misc.py23 import * from fontTools.misc.py23 import *
from fontTools import ttLib from fontTools import ttLib
import unittest import unittest
from ._k_e_r_n import KernTable_format_0 from fontTools.ttLib.tables._k_e_r_n import KernTable_format_0
class MockFont(object): class MockFont(object):

View File

@ -5,7 +5,7 @@ from fontTools.misc.xmlWriter import XMLWriter
import os import os
import struct import struct
import unittest import unittest
from ._l_t_a_g import table__l_t_a_g from fontTools.ttLib.tables._l_t_a_g import table__l_t_a_g
class Test_l_t_a_g(unittest.TestCase): class Test_l_t_a_g(unittest.TestCase):

View File

@ -6,8 +6,8 @@ from fontTools.misc.xmlWriter import XMLWriter
from fontTools.misc.loggingTools import CapturingLogHandler from fontTools.misc.loggingTools import CapturingLogHandler
import struct import struct
import unittest import unittest
from ._n_a_m_e import table__n_a_m_e, NameRecord, nameRecordFormat, nameRecordSize from fontTools.ttLib.tables._n_a_m_e import (
from ._n_a_m_e import makeName, log table__n_a_m_e, NameRecord, nameRecordFormat, nameRecordSize, makeName, log)
class NameTableTest(unittest.TestCase): class NameTableTest(unittest.TestCase):

View File

@ -2,7 +2,7 @@ from __future__ import print_function, division, absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
from fontTools.misc.py23 import * from fontTools.misc.py23 import *
from fontTools.ttLib.tables._v_m_t_x import table__v_m_t_x from fontTools.ttLib.tables._v_m_t_x import table__v_m_t_x
from fontTools.ttLib.tables import _h_m_t_x_test import _h_m_t_x_test
import unittest import unittest

View File

@ -1,7 +1,8 @@
from __future__ import print_function, division, absolute_import, unicode_literals from __future__ import print_function, division, absolute_import, unicode_literals
from fontTools.misc.py23 import * from fontTools.misc.py23 import *
from fontTools import ttLib from fontTools import ttLib
from .woff2 import (WOFF2Reader, woff2DirectorySize, woff2DirectoryFormat, from fontTools.ttLib.woff2 import (
WOFF2Reader, woff2DirectorySize, woff2DirectoryFormat,
woff2FlagsSize, woff2UnknownTagSize, woff2Base128MaxSize, WOFF2DirectoryEntry, woff2FlagsSize, woff2UnknownTagSize, woff2Base128MaxSize, WOFF2DirectoryEntry,
getKnownTagIndex, packBase128, base128Size, woff2UnknownTagIndex, getKnownTagIndex, packBase128, base128Size, woff2UnknownTagIndex,
WOFF2FlavorData, woff2TransformedTableTags, WOFF2GlyfTable, WOFF2LocaTable, WOFF2FlavorData, woff2TransformedTableTags, WOFF2GlyfTable, WOFF2LocaTable,