Merge branch 'develop' of github.com:ethereum/pyethereum into develop

Author: vub

.gitignore

@@ -24,3 +24,4 @@ peers.json
 pyethereum/todo.txt
 pyethereum/monkeypatch.py
 .eggs
+.cache

dev_requirements.txt

@@ -1,6 +1,6 @@
 tox
 coveralls
 pytest
-pytest-capturelog
+pytest-catchlog==1.1
 pytest-timeout
 https://github.com/ethereum/serpent/tarball/develop

ethereum/tests/conftest.py

@@ -2,20 +2,23 @@
 from ethereum import slogging
 
 
+CATCH_LOG_HANDLER_NAME = 'catch_log_handler'
+
+
 @pytest.mark.hookwrapper
 def pytest_runtest_setup(item):
-    """Attach pytest-capturelog's handler to `slogging`'s root logger"""
+    """Attach pytest-catchlog's handler to `slogging`'s root logger"""
     yield
-    caplog_handler = getattr(item, 'capturelog_handler', None)
+    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)
 
 
 @pytest.mark.hookwrapper
 def pytest_runtest_makereport(item, call):
-    """Remove pytest-capturelog's handler from `slogging`'s root logger"""
+    """Remove pytest-catchlog's handler from `slogging`'s root logger"""
     if call.when == 'call':
-        caplog_handler = getattr(item, 'capturelog_handler', None)
+        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

ethereum/tests/test_logging.py

@@ -9,7 +9,7 @@
 def test_basic(caplog, level_name):
     slogging.configure(":trace")
     log = slogging.get_logger()
-    with caplog.atLevel('TRACE'):
+    with caplog.at_level('TRACE'):
         getattr(log, level_name)(level_name)
 
     assert len(caplog.records()) == 1
@@ -234,13 +234,13 @@ def test_bound_logger(caplog):
     real_log = slogging.getLogger()
 
     bound_log_1 = real_log.bind(key1="value1")
-    with caplog.atLevel(slogging.TRACE):
+    with caplog.at_level(slogging.TRACE):
         bound_log_1.info("test1")
         assert "test1" in caplog.text()
         assert "key1=value1" in caplog.text()
 
     bound_log_2 = bound_log_1.bind(key2="value2")
-    with caplog.atLevel(slogging.TRACE):
+    with caplog.at_level(slogging.TRACE):
         bound_log_2.info("test2")
         assert "test2" in caplog.text()
         assert "key1=value1" in caplog.text()
@@ -255,14 +255,14 @@ def test_bound_logger_isolation(caplog):
     real_log = slogging.getLogger()
 
     bound_log_1 = real_log.bind(key1="value1")
-    with caplog.atLevel(slogging.TRACE):
+    with caplog.at_level(slogging.TRACE):
         bound_log_1.info("test1")
         records = caplog.records()
         assert len(records) == 1
         assert "test1" in records[0].msg
         assert "key1=value1" in records[0].msg
 
-    with caplog.atLevel(slogging.TRACE):
+    with caplog.at_level(slogging.TRACE):
         real_log.info("test2")
         records = caplog.records()
         assert len(records) == 2
@@ -308,6 +308,17 @@ def test_logging_reconfigure():
     assert len(eth_vm_logger.handlers) == 0
 
 
+@pytest.mark.parametrize(
+    ('config', 'logger', 'level'), (
+        (":WARNING", "", "WARNING"),
+        (":DEBUG,eth:INFO", "", "DEBUG"),
+        (":DEBUG,eth:INFO", "eth", "INFO"),
+        (":DEBUG,eth:INFO,devp2p:INFO", "devp2p", "INFO"),))
+def test_logging_reconfigure_levels(config, logger, level):
+    slogging.configure(config)
+    assert slogging.getLogger(logger).level == getattr(logging, level)
+
+
 def test_set_level():
     slogging.set_level('test', 'CRITICAL')
     assert slogging.getLogger('test').level == logging.CRITICAL

tox.ini

@@ -5,7 +5,6 @@ envlist = py27,coverage
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/ethereum
-#commands = python setup.py test
 commands = coverage run --source=ethereum --branch -m py.test {posargs}
 deps =
     -r{toxinidir}/requirements.txt
@@ -15,5 +14,6 @@ deps =
 [testenv:coverage]
 deps =
     coverage
+skip_install = true
 commands =
     coverage report --show-missing