Cleanup test loading

Author: ulope

.travis.yml

@@ -4,8 +4,8 @@ sudo: false
 env:
 - TOX_ENV=py27
 install:
-- pip install -r requirements.txt
-- pip install -r dev_requirements.txt
+- pip install -Ur requirements.txt
+- pip install -Ur dev_requirements.txt
 script:
 - coverage run --source ethereum -m py.test --ignore ethereum/tests/test_vm.py --ignore
   ethereum/tests/test_state.py

dev_requirements.txt

@@ -1,6 +1,6 @@
 tox
 coveralls
-pytest
-pytest-catchlog==1.1
-pytest-timeout==0.5
+pytest>=2.9.0
+pytest-catchlog==1.2.2
+pytest-timeout==1.0.0
 https://github.com/ethereum/serpent/tarball/develop

ethereum/tests/conftest.py

@@ -1,24 +1,19 @@
 import pytest
+
 from ethereum import slogging
 
 
 CATCH_LOG_HANDLER_NAME = 'catch_log_handler'
 
 
-@pytest.mark.hookwrapper
-def pytest_runtest_setup(item):
-    """Attach pytest-catchlog's handler to `slogging`'s root logger"""
-    yield
-    caplog_handler = getattr(item, CATCH_LOG_HANDLER_NAME, None)
-    if caplog_handler and caplog_handler not in slogging.rootLogger.handlers:
-        slogging.rootLogger.addHandler(caplog_handler)
+# Connect catchlog's handler to slogging's root logger
+@pytest.hookimpl(hookwrapper=True)
+def pytest_runtest_call(item):
+    catchlog_handler = getattr(item, CATCH_LOG_HANDLER_NAME, None)
+    if catchlog_handler and catchlog_handler not in slogging.rootLogger.handlers:
+        slogging.rootLogger.addHandler(catchlog_handler)
 
+    _ = yield
 
-@pytest.mark.hookwrapper
-def pytest_runtest_makereport(item, call):
-    """Remove pytest-catchlog's handler from `slogging`'s root logger"""
-    if call.when == 'call':
-        caplog_handler = getattr(item, CATCH_LOG_HANDLER_NAME, None)
-        if caplog_handler and caplog_handler in slogging.rootLogger.handlers:
-            slogging.rootLogger.removeHandler(caplog_handler)
-    yield
+    if catchlog_handler and catchlog_handler in slogging.rootLogger.handlers:
+        slogging.rootLogger.removeHandler(catchlog_handler)

ethereum/tests/test_abi.py

@@ -4,31 +4,24 @@
 import ethereum.abi as abi
 logger = get_logger()
 
+
 def test_abi_encode_var_sized_array():
     abi.encode_abi(['address[]'], [[b'\x00' * 20] * 3])
 
+
 def test_abi_encode_fixed_size_array():
     abi.encode_abi(['uint16[2]'], [[5, 6]])
 
+
 def test_abi_encode_signed_int():
     assert abi.decode_abi(['int8'], abi.encode_abi(['int8'], [1]))[0] == 1
     assert abi.decode_abi(['int8'], abi.encode_abi(['int8'], [-1]))[0] == -1
 
 
-# SETUP TESTS IN GLOBAL NAME SPACE
-def gen_func(filename, testname, testdata):
-    return lambda: do_test_state(filename, testname, testdata)
-
-def do_test_state(filename, testname=None, testdata=None, limit=99999999):
-    logger.debug('running test:%r in %r' % (testname, filename))
+# Will be parametrized fron json fixtures
+def test_state(filename, testname, testdata):
     testutils.check_abi_test(testutils.fixture_to_bytes(testdata))
 
-fixtures = testutils.get_tests_from_file_or_dir(
-    os.path.join(testutils.fixture_path, 'ABITests'))
 
-filenames = sorted(list(fixtures.keys()))
-for filename in filenames:
-    tests = fixtures[filename]
-    for testname, testdata in list(tests.items()):
-        func_name = 'test_%s_%s' % (filename, testname)
-        globals()[func_name] = gen_func(filename, testname, testdata)
+def pytest_generate_tests(metafunc):
+    testutils.generate_test_params('ABITests', metafunc)

ethereum/tests/test_blocks.py

@@ -1,3 +1,5 @@
+import pytest
+
 from ethereum import blocks, utils, db
 from ethereum.exceptions import VerificationFailed, InvalidTransaction
 import rlp
@@ -106,41 +108,44 @@ def run_block_test(params, config_overrides = {}):
     env.config = old_config
 
 
-def do_test_block(filename, testname=None, testdata=None, limit=99999999):
-    print('\nrunning test:%r in %r' % (testname, filename))
+def test_block(filename, testname, testdata):
     run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
 
-excludes = [('bcWalletTest.json', u'walletReorganizeOwners'),
-            ('bl10251623GO.json', u'randomBlockTest'),
-            ('bl201507071825GO.json', u'randomBlockTest')
-            ]
 
+excludes = {
+    ('bcWalletTest.json', u'walletReorganizeOwners'),
+    ('bl10251623GO.json', u'randomBlockTest'),
+    ('bl201507071825GO.json', u'randomBlockTest')
+}
 
-if __name__ == '__main__':
+
+def pytest_generate_tests(metafunc):
+    testutils.generate_test_params(
+        'BlockchainTests',
+        metafunc,
+        lambda filename, testname, _: (filename.split('/')[-1], testname) in excludes
+    )
+
+
+def main():
     assert len(sys.argv) >= 2, "Please specify file or dir name"
     fixtures = testutils.get_tests_from_file_or_dir(sys.argv[1])
     if len(sys.argv) >= 3:
         for filename, tests in list(fixtures.items()):
             for testname, testdata in list(tests.items()):
                 if testname == sys.argv[2]:
                     print("Testing: %s %s" % (filename, testname))
-                    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
+                    run_block_test(testdata, {
+                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename
+                        else 1000000})
     else:
         for filename, tests in list(fixtures.items()):
             for testname, testdata in list(tests.items()):
                 if (filename.split('/')[-1], testname) not in excludes:
                     print("Testing: %s %s" % (filename, testname))
-                    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
-else:
-    fixtures = testutils.get_tests_from_file_or_dir(
-        os.path.join(testutils.fixture_path, 'BlockchainTests'))
-
-    def mk_test_func(filename, testname, testdata):
-        return lambda: do_test_block(filename, testname, testdata)
-
-    for filename, tests in list(fixtures.items()):
-        for testname, testdata in list(tests.items())[:500]:
-            func_name = 'test_%s_%s' % (filename, testname)
-            if (filename.split('/')[-1], testname) not in excludes:
-                # print 'making function', (filename.split('/')[-1], testname)
-                globals()[func_name] = mk_test_func(filename, testname, testdata)
+                    run_block_test(testdata, {
+                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000})
+
+
+if __name__ == '__main__':
+    main()

ethereum/tests/test_contracts.py

@@ -2,21 +2,15 @@
 import os
 
 import bitcoin
+from secp256k1 import PrivateKey
 import pytest
 import serpent
-from rlp.utils import decode_hex, encode_hex
+from rlp.utils import decode_hex
 
 from ethereum import tester, utils, abi
 from ethereum.slogging import set_level
-from ethereum.utils import safe_ord
+from ethereum.utils import safe_ord, big_endian_to_int
 
-try:
-    from c_secp256k1 import ecdsa_sign_raw
-except ImportError:
-    import warnings
-    warnings.warn('missing c_secp256k1 falling back to pybitcointools')
-
-    from bitcoin import ecdsa_raw_sign as ecdsa_sign_raw
 
 # customize VM log output to your needs
 # hint: use 'py.test' with the '-s' option to dump logs to the console
@@ -943,7 +937,6 @@ def kall():
 
 """
 
-import bitcoin
 
 
 def test_saveload():
@@ -1214,17 +1207,26 @@ def test_ecrecover():
     s = tester.state()
     c = s.abi_contract(ecrecover_code)
 
-    priv = encode_hex(utils.sha3('some big long brainwallet password'))
+    priv = utils.sha3('some big long brainwallet password')
     pub = bitcoin.privtopub(priv)
 
-    msghash = encode_hex(utils.sha3('the quick brown fox jumps over the lazy dog'))
-    V, R, S = ecdsa_sign_raw(msghash, priv)
+    msghash = utils.sha3('the quick brown fox jumps over the lazy dog')
+
+    pk = PrivateKey(priv, raw=True)
+    signature = pk.ecdsa_recoverable_serialize(
+        pk.ecdsa_sign_recoverable(msghash, raw=True)
+    )
+    signature = signature[0] + chr(signature[1])
+    V = ord(signature[64]) + 27
+    R = big_endian_to_int(signature[0:32])
+    S = big_endian_to_int(signature[32:64])
+
     assert bitcoin.ecdsa_raw_verify(msghash, (V, R, S), pub)
 
     addr = utils.big_endian_to_int(utils.sha3(bitcoin.encode_pubkey(pub, 'bin')[1:])[12:])
     assert utils.big_endian_to_int(utils.privtoaddr(priv)) == addr
 
-    result = c.test_ecrecover(utils.big_endian_to_int(decode_hex(msghash)), V, R, S)
+    result = c.test_ecrecover(utils.big_endian_to_int(msghash), V, R, S)
     assert result == addr
 
 

ethereum/tests/test_keys.py

@@ -6,23 +6,12 @@
 logger = get_logger()
 
 
-# SETUP TESTS IN GLOBAL NAME SPACE
-def gen_func(filename, testname, testdata):
-    return lambda: do_test_key(filename, testname, testdata)
-
-
-def do_test_key(filename, testname=None, testdata=None, limit=99999999):
+def test_key(filename, testname, testdata,):
     logger.debug('running test:%r in %r' % (testname, filename))
     assert keys.check_keystore_json(testdata["json"])
     privkey = keys.decode_keystore_json(testdata["json"], testdata["password"])
     assert utils.encode_hex(privkey) == utils.to_string(testdata["priv"])
 
-fixtures = testutils.get_tests_from_file_or_dir(
-    os.path.join(testutils.fixture_path, 'KeyStoreTests'))
 
-filenames = sorted(list(fixtures.keys()))
-for filename in filenames:
-    tests = fixtures[filename]
-    for testname, testdata in list(tests.items()):
-        func_name = 'test_%s_%s' % (filename, testname)
-        globals()[func_name] = gen_func(filename, testname, testdata)
+def pytest_generate_tests(metafunc):
+    testutils.generate_test_params('KeyStoreTests', metafunc)

ethereum/tests/test_logging.py

@@ -62,10 +62,10 @@ def div(a, b):
         except Exception as e:
             log.error('an Exception trace should preceed this msg', exc_info=True)
     div(1, 0)
-    assert 'an Exception trace' in caplog.text()
-    assert 'Traceback' in caplog.text()
+    assert 'an Exception trace' in caplog.text
+    assert 'Traceback' in caplog.text
     div(1, 1)
-    assert 'the stack' in caplog.text()
+    assert 'the stack' in caplog.text
 
 
 def test_listeners(caplog):
@@ -80,17 +80,17 @@ def log_cb(event_dict):
     # activate listener
     slogging.log_listeners.append(log_cb)  # Add handlers
     log.error('test listener', abc='thislistener')
-    assert 'thislistener' in caplog.text()
+    assert 'thislistener' in caplog.text
     r = called.pop()
     assert r == dict(event='test listener', abc='thislistener')
 
     log.trace('trace is usually filtered', abc='thislistener')  # this handler for function log_cb does not work
-    assert "trace is usually filtered" not in caplog.text()
+    assert "trace is usually filtered" not in caplog.text
 
     # deactivate listener
     slogging.log_listeners.remove(log_cb)
     log.error('test listener', abc='nolistener')
-    assert 'nolistener' in caplog.text()
+    assert 'nolistener' in caplog.text
     assert not called
 
 
@@ -161,7 +161,7 @@ def test_recorder(caplog):
     recorder = slogging.LogRecorder()
     assert len(slogging.log_listeners) == 1
     log.info('a', v=1)
-    assert "a" in caplog.text()
+    assert "a" in caplog.text
     r = recorder.pop_records()
     assert r[0] == dict(event='a', v=1)
     assert len(slogging.log_listeners) == 0
@@ -171,7 +171,7 @@ def test_recorder(caplog):
     recorder = slogging.LogRecorder()
     assert len(slogging.log_listeners) == 1
     log.trace('a', v=2)
-    assert '"v": 2' in caplog.text()
+    assert '"v": 2' in caplog.text
     r = recorder.pop_records()
     assert r[0] == dict(event='a', v=2)
     assert len(slogging.log_listeners) == 0
@@ -224,9 +224,9 @@ def test_logger_filter(caplog, logger_name, filter, should_log):
         log.addFilter(logging.Filter(filter))
     log.info("testlogmessage", v=1)
     if should_log:
-        assert "testlogmessage" in caplog.text()
+        assert "testlogmessage" in caplog.text
     else:
-        assert "testlogmessage" not in caplog.text()
+        assert "testlogmessage" not in caplog.text
 
 
 def test_bound_logger(caplog):
@@ -236,15 +236,15 @@ def test_bound_logger(caplog):
     bound_log_1 = real_log.bind(key1="value1")
     with caplog.at_level(slogging.TRACE):
         bound_log_1.info("test1")
-        assert "test1" in caplog.text()
-        assert "key1=value1" in caplog.text()
+        assert "test1" in caplog.text
+        assert "key1=value1" in caplog.text
 
     bound_log_2 = bound_log_1.bind(key2="value2")
     with caplog.at_level(slogging.TRACE):
         bound_log_2.info("test2")
-        assert "test2" in caplog.text()
-        assert "key1=value1" in caplog.text()
-        assert "key2=value2" in caplog.text()
+        assert "test2" in caplog.text
+        assert "key1=value1" in caplog.text
+        assert "key2=value2" in caplog.text
 
 
 def test_bound_logger_isolation(caplog):