summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-10-02 13:29:13 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-10-02 13:29:13 (GMT)
commit8f7bcb3f8557ebae74a710610aeb4db63421e496 (patch)
treeb8cc5da44462dd8421d48e83d894a2719644eb4a
parentaef57e3969a12a49aecaa01f7a8c9fa2d3bc8312 (diff)
downloadcpython-8f7bcb3f8557ebae74a710610aeb4db63421e496.zip
cpython-8f7bcb3f8557ebae74a710610aeb4db63421e496.tar.gz
cpython-8f7bcb3f8557ebae74a710610aeb4db63421e496.tar.bz2
Make the printing of sqlite version in verbose mode work with regrtest -w.
-rw-r--r--Lib/test/test_sqlite.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py
index 8f8cd87..1086330 100644
--- a/Lib/test/test_sqlite.py
+++ b/Lib/test/test_sqlite.py
@@ -1,7 +1,7 @@
-from test.support import run_unittest, import_module, verbose
+import test.support
# Skip test if _sqlite3 module not installed
-import_module('_sqlite3')
+test.support.import_module('_sqlite3')
import sqlite3
from sqlite3.test import (dbapi, types, userfunctions,
@@ -9,13 +9,15 @@ from sqlite3.test import (dbapi, types, userfunctions,
dump)
def test_main():
- if verbose:
+ if test.support.verbose:
print("test_sqlite: testing with version",
"{!r}, sqlite_version {!r}".format(sqlite3.version,
sqlite3.sqlite_version))
- run_unittest(dbapi.suite(), types.suite(), userfunctions.suite(),
- factory.suite(), transactions.suite(),
- hooks.suite(), regression.suite(), dump.suite())
+ test.support.run_unittest(dbapi.suite(), types.suite(),
+ userfunctions.suite(),
+ factory.suite(), transactions.suite(),
+ hooks.suite(), regression.suite(),
+ dump.suite())
if __name__ == "__main__":
test_main()