MonetDB: Jan2022 - Allow a list of potential error messages in t...

[Sjoerd Mullender]

Changeset: 06a36fb1aa73 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/06a36fb1aa73
Modified Files:
        sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
        testing/sqltest.py
Branch: Jan2022
Log Message:

Allow a list of potential error messages in tests using assertFailed.


diffs (60 lines):

diff --git 
a/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py 
b/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
--- a/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
+++ b/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
@@ -9,7 +9,7 @@ with SQLTestCase() as tc:
         tf.flush()
         tf.seek(0)
 
-        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message='!syntax error, unexpected 
$end in: "select foo"')
+        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error, 
unexpected $end in: "select foo"', '!syntax error in: "select foo"'])
         tf.seek(0)
         tf.truncate(0)
 
@@ -27,7 +27,7 @@ with SQLTestCase() as tc:
         tf.flush()
         tf.seek(0)
 
-        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message='!syntax error, unexpected 
$end, expecting SCOLON in: "select foo."')
+        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error, 
unexpected $end, expecting SCOLON in: "select foo."', '!syntax error in: 
"select foo."'])
         tf.seek(0)
         tf.truncate(0)
 
@@ -36,7 +36,7 @@ with SQLTestCase() as tc:
         tf.flush()
         tf.seek(0)
 
-        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message='!syntax error, unexpected 
$end, expecting SCOLON in: "select foo-"')
+        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error, 
unexpected $end, expecting SCOLON in: "select foo-"', '!syntax error in: 
"select foo-"'])
         tf.seek(0)
         tf.truncate(0)
 
@@ -45,7 +45,7 @@ with SQLTestCase() as tc:
         tf.flush()
         tf.seek(0)
 
-        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message='!syntax error, unexpected 
$end in: "select f001234"')
+        tc.execute(None, '-fraw', client='mclient', 
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error, 
unexpected $end in: "select f001234"', '!syntax error in: "select f001234"'])
         tf.seek(0)
         tf.truncate(0)
 
diff --git a/testing/sqltest.py b/testing/sqltest.py
--- a/testing/sqltest.py
+++ b/testing/sqltest.py
@@ -244,8 +244,15 @@ class TestCaseResult(object):
                     msgs.append( "expected to fail with error code {} but 
failed with error code {}".format(err_code, self.err_code))
             if err_message:
                 if self.err_message:
-                    if err_message.lower() != self.err_message.lower():
-                        msgs.append("expected to fail with error message '{}' 
but failed with error message '{}'".format(err_message, self.err_message))
+                    if type(err_message) is type(''):
+                        if err_message.lower() != self.err_message.lower():
+                            msgs.append("expected to fail with error message 
'{}' but failed with error message '{}'".format(err_message, self.err_message))
+                    else:
+                        for em in err_message:
+                            if em.lower() == self.err_message.lower():
+                                break
+                        else:
+                            msgs.append("expected to fail with error message 
'{}' but failed with error message '{}'".format(err_message, self.err_message))
                 else:
                     msgs.append("expected to fail with error message '{}' but 
got '{}'".format(err_message, self.err_message))
             if len(msgs) > 0:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org