summaryrefslogtreecommitdiff
path: root/Lib/sqlite3/test/regression.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-06-14 14:19:33 +0300
committerBerker Peksag <berker.peksag@gmail.com>2016-06-14 14:19:33 +0300
commit357be7ccdb85257b42f63f13def43cbd55d4c9fe (patch)
treec0fa2d22a6bd70f4eff12415e77e56e6cb074b9e /Lib/sqlite3/test/regression.py
parent7fb468bf3e284c1b9609c98af0401ce3cda20064 (diff)
parentf85bce74db9198498f394cf3b12e3c9edab9fc09 (diff)
downloadcpython-git-357be7ccdb85257b42f63f13def43cbd55d4c9fe.tar.gz
Merge from 3.5
Diffstat (limited to 'Lib/sqlite3/test/regression.py')
-rw-r--r--Lib/sqlite3/test/regression.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index 0cf9002d8c..44974b008b 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -84,9 +84,8 @@ class RegressionTests(unittest.TestCase):
cur.execute("select 1 x union select " + str(i))
con.close()
+ @unittest.skipIf(sqlite.sqlite_version_info < (3, 2, 2), 'needs sqlite 3.2.2 or newer')
def CheckOnConflictRollback(self):
- if sqlite.sqlite_version_info < (3, 2, 2):
- return
con = sqlite.connect(":memory:")
con.execute("create table foo(x, unique(x) on conflict rollback)")
con.execute("insert into foo(x) values (1)")