[Python-checkins] cpython (merge 3.3 -> default): #17692: merge with 3.3.
ezio.melotti
python-checkins at python.org
Fri Apr 12 13:14:36 CEST 2013
http://hg.python.org/cpython/rev/4c73d4785829
changeset: 83262:4c73d4785829
parent: 83260:82451c88b3c0
parent: 83261:71c4234eb39f
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Apr 12 14:14:22 2013 +0300
summary:
#17692: merge with 3.3.
files:
Lib/test/test_sqlite.py | 9 +++++----
Misc/NEWS | 3 +++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py
--- a/Lib/test/test_sqlite.py
+++ b/Lib/test/test_sqlite.py
@@ -3,21 +3,22 @@
# 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()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,9 @@
- Issue #17690: test_time now works with unittest test discovery.
Patch by Zachary Ware.
+- Issue #17692: test_sqlite now works with unittest test discovery.
+ Patch by Zachary Ware.
+
What's New in Python 3.3.1 release candidate 1?
===============================================
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list