changeset 40363:c3ad9ef0876c

tests: don't emit false failures when sqlite3 is missing I'm honestly surprised we have buildbot coverage for this, but we do! Differential Revision: https://phab.mercurial-scm.org/D5150
author Augie Fackler <augie@google.com>
date Thu, 18 Oct 2018 11:14:04 -0400
parents 2f1edf5e0a4b
children 0a212b643277
files tests/test-duplicateoptions.py tests/test-storage.py
diffstat 2 files changed, 18 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-duplicateoptions.py	Tue Oct 16 08:48:23 2018 +0200
+++ b/tests/test-duplicateoptions.py	Thu Oct 18 11:14:04 2018 -0400
@@ -8,6 +8,11 @@
 
 ignore = {b'highlight', b'win32text', b'factotum', b'beautifygraph'}
 
+try:
+    import sqlite3
+except ImportError:
+    ignore.add(b'sqlitestore')
+
 if os.name != 'nt':
     ignore.add(b'win32mbcs')
 
--- a/tests/test-storage.py	Tue Oct 16 08:48:23 2018 +0200
+++ b/tests/test-storage.py	Thu Oct 18 11:14:04 2018 -0400
@@ -17,9 +17,12 @@
     storage as storagetesting,
 )
 
-from hgext import (
-    sqlitestore,
-)
+try:
+    from hgext import (
+        sqlitestore,
+    )
+except ImportError:
+    sqlitestore = None
 
 try:
     from mercurial import zstd
@@ -110,12 +113,13 @@
     else:
         raise error.Abort(b'must supply rawtext or delta arguments')
 
-sqlitefileindextests = storagetesting.makeifileindextests(
-    makesqlitefile, maketransaction, addrawrevisionsqlite)
-sqlitefiledatatests = storagetesting.makeifiledatatests(
-    makesqlitefile, maketransaction, addrawrevisionsqlite)
-sqlitefilemutationtests = storagetesting.makeifilemutationtests(
-    makesqlitefile, maketransaction, addrawrevisionsqlite)
+if sqlitestore is not None:
+    sqlitefileindextests = storagetesting.makeifileindextests(
+        makesqlitefile, maketransaction, addrawrevisionsqlite)
+    sqlitefiledatatests = storagetesting.makeifiledatatests(
+        makesqlitefile, maketransaction, addrawrevisionsqlite)
+    sqlitefilemutationtests = storagetesting.makeifilemutationtests(
+        makesqlitefile, maketransaction, addrawrevisionsqlite)
 
 if __name__ == '__main__':
     silenttestrunner.main(__name__)