Changeset: a3df47dd4093 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3df47dd4093
Modified Files:
        testing/Mfilter.py
Branch: default
Log Message:

Mfilter.py: normalise remote execution error messages on client side (.malC 
tests)
rather than on server side (.mal tests)


diffs (12 lines):

diff --git a/testing/Mfilter.py b/testing/Mfilter.py
--- a/testing/Mfilter.py
+++ b/testing/Mfilter.py
@@ -83,7 +83,7 @@ norm_in  = re.compile('(?:'+')|(?:'.join
     r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error, 
)(?:unexpected .* on line |unexpected .* in: )?(?:.*)\n',                     # 
2: 5
     r"^(QUERY|ERROR)( =.* connect)( to|)( ')(localhost)(' port )(\d+)( .*)\n", 
                                                                 # 3: 8
     r"^([Uu]sage: )(/.*/\.libs/|/.*/lt-|)([A-Za-z0-9_]+:?[ \t].*)\n",          
                                                                 # 4: 3
-    
r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
                                                        # 5: 4
+    r'^(ERROR = 
!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
                                                # 5: 4
     r"^(DBD::monetdb::db table_info warning: Catalog parameter c has to be an 
empty string, as MonetDB does not support multiple catalogs at 
)([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pl line \d+\.)\n",            # 6: 3
     r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at 
)([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pm line \d+\.)\n',                         
# 7: 4
 # filter for geos 3.3 vs. geos 3.2, can be removed if we have 3.3 everywhere
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to