summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_unittest.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_unittest.py')
-rw-r--r--Lib/test/test_unittest.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 29f8975..cca1836 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -7,6 +7,7 @@ Still need testing:
"""
from StringIO import StringIO
+import __builtin__
import os
import re
import sys
@@ -3410,9 +3411,10 @@ class TestDiscovery(TestCase):
def test_get_module_from_path(self):
loader = unittest.TestLoader()
+ old_import = __import__
def restore_import():
- unittest.__import__ = __import__
- unittest.__import__ = lambda *_: None
+ __builtin__.__import__ = old_import
+ __builtin__.__import__ = lambda *_: None
self.addCleanup(restore_import)
expected_module = object()
l com">** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ #include "qtestfilelogger.h" #include "qtestassert.h" #include "QtTest/private/qtestlog_p.h" #include "QtTest/private/qtestresult_p.h" #include <stdlib.h> #include <stdio.h> QT_BEGIN_NAMESPACE namespace QTest { static FILE *stream = 0; } QTestFileLogger::QTestFileLogger() { } QTestFileLogger::~QTestFileLogger() { if(QTest::stream) fclose(QTest::stream); QTest::stream = 0; } void QTestFileLogger::init() { char filename[100]; QTest::qt_snprintf(filename, sizeof(filename), "%s.log", QTestResult::currentTestObjectName()); // Keep filenames simple for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) { char& c = filename[i]; if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) { c = '_'; } } #if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) if (::fopen_s(&QTest::stream, filename, "wt")) { #else QTest::stream = ::fopen(filename, "wt"); if (!QTest::stream) { #endif printf("Unable to open file for simple logging: %s", filename); ::exit(1); } } void QTestFileLogger::flush(const char *msg) { QTEST_ASSERT(QTest::stream); ::fputs(msg, QTest::stream); ::fflush(QTest::stream); } QT_END_NAMESPACE