change test process and undu tests from py3
This commit is contained in:
parent
9439a8f145
commit
f072036e75
|
@ -12,12 +12,9 @@ from six.moves import configparser
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import state
|
import state
|
||||||
except ImportError:
|
|
||||||
from . import state
|
|
||||||
|
|
||||||
try:
|
|
||||||
from singleton import Singleton
|
from singleton import Singleton
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
from . import state
|
||||||
from .singleton import Singleton
|
from .singleton import Singleton
|
||||||
|
|
||||||
SafeConfigParser = configparser.SafeConfigParser
|
SafeConfigParser = configparser.SafeConfigParser
|
||||||
|
|
|
@ -4,9 +4,9 @@ Test for ECC blind signatures
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
from hashlib import sha256
|
from hashlib import sha256
|
||||||
# from .common import skip_python3
|
from .common import skip_python3
|
||||||
|
|
||||||
# skip_python3()
|
skip_python3()
|
||||||
|
|
||||||
from pybitmessage.pyelliptic import ECCBlind, ECCBlindChain, OpenSSL
|
from pybitmessage.pyelliptic import ECCBlind, ECCBlindChain, OpenSSL
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,9 @@ import os
|
||||||
import tempfile
|
import tempfile
|
||||||
from pybitmessage.bmconfigparser import BMConfigParser
|
from pybitmessage.bmconfigparser import BMConfigParser
|
||||||
from .test_process import TestProcessProto
|
from .test_process import TestProcessProto
|
||||||
|
from .common import skip_python3
|
||||||
|
|
||||||
|
skip_python3()
|
||||||
|
|
||||||
|
|
||||||
class TestProcessConfig(TestProcessProto):
|
class TestProcessConfig(TestProcessProto):
|
||||||
|
|
|
@ -10,9 +10,9 @@ import tempfile
|
||||||
import time
|
import time
|
||||||
import unittest
|
import unittest
|
||||||
import psutil
|
import psutil
|
||||||
from .common import cleanup, put_signal_file
|
|
||||||
from .common import cleanup, put_signal_file, skip_python3
|
from .common import cleanup, put_signal_file, skip_python3
|
||||||
|
|
||||||
|
|
||||||
skip_python3()
|
skip_python3()
|
||||||
|
|
||||||
|
|
||||||
|
|
Reference in New Issue
Block a user