Implement a required_wildcards setting to allow testing switches that
don't support certain match fields; implement l3-l4 for forcing
wildcarding of all L3 and L4 fields; clean up flow_query test a bit
diff --git a/tests/caps.py b/tests/caps.py
index 4657baa..7c187cc 100644
--- a/tests/caps.py
+++ b/tests/caps.py
@@ -63,7 +63,7 @@
     obj.assertEqual(rv, 0, "Failed to delete all flows")
 
     pkt = simple_tcp_packet()
-    match = parse.packet_to_flow_match(pkt)
+    match = packet_to_flow_match(self, pkt)
     obj.assertTrue(match is not None, "Could not generate flow match from pkt")
     for port in of_ports:
         break;