Minor tweaks

Author: rogerbinns

tools/fi.py

@@ -274,6 +274,9 @@ def trace(*args):
     encoded = con.execute("select jsonb(?)", ("""[0x1234, 4., .3, "\\0 𐌼𐌰𐌲 𐌲𐌻𐌴𐍃 𐌹̈𐍄𐌰𐌽", "\\'", "\\"", "\\u1234"]""",)).get
     apsw.jsonb_decode(encoded)
 
+    if expect_exception:
+        return
+
     # fts5
     con.fts5_tokenizer("unicode61", ["remove_diacritics", "1"])
 
@@ -356,6 +359,9 @@ def identity(api, param):
 
     con.execute("select identity(testfts,a) from testfts('e OR 5')").get
 
+    if expect_exception:
+        return
+
     session = apsw.Session(con, "main")
     session.attach()
     con.execute("""create table s1(one PRIMARY KEY, two); insert into s1 values(3, 4);""")
@@ -386,6 +392,9 @@ def __call__(self, data):
 
     apsw.Changeset.concat_stream(StreamInput(changeset), StreamInput(changeset2), StreamOutput())
 
+    if expect_exception:
+        return
+
     class Source:
         def Connect(self, *args):
             con.vtab_config(apsw.SQLITE_VTAB_CONSTRAINT_SUPPORT, 1)
@@ -461,6 +470,9 @@ def Close(self):
 
     con.drop_modules(["something", "vtable", "something else"])
 
+    if expect_exception:
+        return
+
     con.set_profile(lambda: 1)
     con.set_profile(None)
 
@@ -1057,6 +1069,8 @@ def verify_exception(self, tested):
                 # we deliberately ignore errors getting VFSNAMES
                 if tested[-1][0] == "PyUnicode_AsUTF8" and tested[-1][4] in {"qualname", "module"}:
                     ok = True
+                elif tested[-1][0] == "PyObject_GetAttr":
+                    ok = True
                 elif tested[-1][0] == "sqlite3_mprintf":
                     ok = True
             elif tested[-1][0] == "Py_EnterRecursiveCall" and tested[-1][2] == "jsonb_decode_one":