From d6fc489b2bb52fd021bdf6f0513c78bb8d9287e1 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 1 Aug 2014 08:13:44 +0200
Subject: [PATCH] Backed out changeset e57017ad86ce -- logging should not be
 imported

---
 testing/test_capture.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testing/test_capture.py b/testing/test_capture.py
index 02b952be3..591b6761d 100644
--- a/testing/test_capture.py
+++ b/testing/test_capture.py
@@ -340,6 +340,8 @@ class TestLoggingInteraction:
         p = testdir.makepyfile("""
             import sys
             def test_something():
+                # pytest does not import logging
+                assert 'logging' not in sys.modules
                 import logging
                 logging.basicConfig()
                 logging.warn("hello432")