util.py: better matching of known failures

greentest/util.py

 from __future__ import with_statement
 import sys
 import os
+import re
 import traceback
 import unittest
 from datetime import timedelta
@@ -238,14 +239,47 @@ def parse_line(line):
     return (platform, ) + parse_command(parts[1:])
 
 
+def match_word(pattern, word):
+    if isinstance(pattern, str) and isinstance(word, str) and '(' in pattern or '*' in pattern or '?' in pattern or '[' in pattern:
+        return re.match(pattern, word)
+    return pattern == word
+
+
+def match_environ(expected_environ, actual_environ):
+    """
+    >>> match_environ('GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8',
+    ...               'GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 GEVENT_FILE=thread')
+    True
+    >>> match_environ('GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.7',
+    ...               'GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 GEVENT_FILE=thread')
+    False
+    >>> match_environ('GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 GEVENT_FILE=',
+    ...               'GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 GEVENT_FILE=thread')
+    False
+    """
+    if expected_environ is None:
+        return True
+    if isinstance(expected_environ, basestring):
+        expected_environ = expected_environ.split()
+    if isinstance(actual_environ, basestring):
+        actual_environ = actual_environ.split()
+    expected_environ = dict(x.split('=') for x in expected_environ)
+    actual_environ = dict(x.split('=') for x in actual_environ)
+    for key, expected_value in expected_environ.items():
+        value = actual_environ.pop(key, None)
+        if value is not None and value != expected_value:
+            return False
+    return True
+
+
 def match_line(line, command):
     expected_platform, expected_environ, expected_exe, expected_arguments = parse_line(line)
     if expected_platform is not None and expected_platform != sys.platform:
         return
     environ, exe, arguments = parse_command(command)
-    if expected_environ is not None and expected_environ != environ:
+    if not match_environ(expected_environ, environ):
         return
-    if expected_exe is not None and expected_exe != exe:
+    if expected_exe is not None and not match_word(expected_exe, exe):
         return
     return expected_arguments == arguments
 
@@ -254,10 +288,20 @@ def matches(expected, command):
     """
     >>> matches(["* * C:\Python27\python.exe -u -m monkey_test --Event test_threading.py"], "C:\Python27\python.exe -u -m monkey_test --Event test_threading.py")
     True
+    >>> matches(['* * /usr/bin/python2.5(-dbg)? -u -m monkey_test --Event test_urllib2net.py'], "/usr/bin/python2.5-dbg -u -m monkey_test --Event test_urllib2net.py")
+    True
+    >>> matches(['* * /usr/bin/python2.5(-dbg)? -u -m monkey_test --Event test_urllib2net.py'], "/usr/bin/python2.5 -u -m monkey_test --Event test_urllib2net.py")
+    True
+    >>> matches(['* * /usr/bin/python2.5(-dbg)? -u -m monkey_test --Event test_urllib2net.py'], "/usr/bin/python2.6 -u -m monkey_test --Event test_urllib2net.py")
+    False
+    >>> matches(['* GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 python -u test__subprocess.py'],
+    ...          "GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 GEVENT_FILE=thread python -u test__subprocess.py")
+    True
     """
     for line in expected:
         if match_line(line, command):
             return True
+    return False
 
 
 def format_seconds(seconds):