Merge branch 'no-unittest2'

Close #516
This commit is contained in:
Daniele Varrazzo 2017-03-02 12:41:33 +00:00
commit 3a441467c0

View File

@ -22,22 +22,15 @@
# License for more details. # License for more details.
# Use unittest2 if available. Otherwise mock a skip facility with warnings.
import re import re
import os import os
import sys import sys
import select import select
import platform import platform
import unittest
from functools import wraps from functools import wraps
from testconfig import dsn, repl_dsn from testconfig import dsn, repl_dsn
try:
import unittest2
unittest = unittest2
except ImportError:
import unittest
unittest2 = None
if hasattr(unittest, 'skipIf'): if hasattr(unittest, 'skipIf'):
skip = unittest.skip skip = unittest.skip