##// END OF EJS Templates
tests: don't emit false failures when sqlite3 is missing...
Augie Fackler -
r40399:c3ad9ef0 default
parent child Browse files
Show More
@@ -8,6 +8,11 b' from mercurial import ('
8
8
9 ignore = {b'highlight', b'win32text', b'factotum', b'beautifygraph'}
9 ignore = {b'highlight', b'win32text', b'factotum', b'beautifygraph'}
10
10
11 try:
12 import sqlite3
13 except ImportError:
14 ignore.add(b'sqlitestore')
15
11 if os.name != 'nt':
16 if os.name != 'nt':
12 ignore.add(b'win32mbcs')
17 ignore.add(b'win32mbcs')
13
18
@@ -17,9 +17,12 b' from mercurial.testing import ('
17 storage as storagetesting,
17 storage as storagetesting,
18 )
18 )
19
19
20 from hgext import (
20 try:
21 sqlitestore,
21 from hgext import (
22 )
22 sqlitestore,
23 )
24 except ImportError:
25 sqlitestore = None
23
26
24 try:
27 try:
25 from mercurial import zstd
28 from mercurial import zstd
@@ -110,12 +113,13 b' def addrawrevisionsqlite(self, fl, tr, n'
110 else:
113 else:
111 raise error.Abort(b'must supply rawtext or delta arguments')
114 raise error.Abort(b'must supply rawtext or delta arguments')
112
115
113 sqlitefileindextests = storagetesting.makeifileindextests(
116 if sqlitestore is not None:
114 makesqlitefile, maketransaction, addrawrevisionsqlite)
117 sqlitefileindextests = storagetesting.makeifileindextests(
115 sqlitefiledatatests = storagetesting.makeifiledatatests(
118 makesqlitefile, maketransaction, addrawrevisionsqlite)
116 makesqlitefile, maketransaction, addrawrevisionsqlite)
119 sqlitefiledatatests = storagetesting.makeifiledatatests(
117 sqlitefilemutationtests = storagetesting.makeifilemutationtests(
120 makesqlitefile, maketransaction, addrawrevisionsqlite)
118 makesqlitefile, maketransaction, addrawrevisionsqlite)
121 sqlitefilemutationtests = storagetesting.makeifilemutationtests(
122 makesqlitefile, maketransaction, addrawrevisionsqlite)
119
123
120 if __name__ == '__main__':
124 if __name__ == '__main__':
121 silenttestrunner.main(__name__)
125 silenttestrunner.main(__name__)
General Comments 0
You need to be logged in to leave comments. Login now