summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-12 11:14:22 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-12 11:14:22 (GMT)
commit7ec97f415ce2468473bae39b4b6be56b6c55963a (patch)
tree3c0527efca66b76295cffbd51777a26d82abf940 /Lib
parent663a3904545f709e7af5b4a122c2e9d01b07fef6 (diff)
parentc2ecac4787a9cadabbb33c7aede405315ed55240 (diff)
downloadcpython-7ec97f415ce2468473bae39b4b6be56b6c55963a.zip
cpython-7ec97f415ce2468473bae39b4b6be56b6c55963a.tar.gz
cpython-7ec97f415ce2468473bae39b4b6be56b6c55963a.tar.bz2
#17692: merge with 3.3.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_sqlite.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py
index 1086330..adfcd99 100644
--- a/Lib/test/test_sqlite.py
+++ b/Lib/test/test_sqlite.py
@@ -3,21 +3,22 @@ import test.support
# Skip test if _sqlite3 module not installed
test.support.import_module('_sqlite3')
+import unittest
import sqlite3
from sqlite3.test import (dbapi, types, userfunctions,
factory, transactions, hooks, regression,
dump)
-def test_main():
+def load_tests(*args):
if test.support.verbose:
print("test_sqlite: testing with version",
"{!r}, sqlite_version {!r}".format(sqlite3.version,
sqlite3.sqlite_version))
- test.support.run_unittest(dbapi.suite(), types.suite(),
+ return unittest.TestSuite([dbapi.suite(), types.suite(),
userfunctions.suite(),
factory.suite(), transactions.suite(),
hooks.suite(), regression.suite(),
- dump.suite())
+ dump.suite()])
if __name__ == "__main__":
- test_main()
+ unittest.main()