commit 641167f1664d837bbd3a18b1e48e4d8486742659
author Jonathan Stout <jonstout@indiana.edu> Tue Feb 04 12:07:10 2014 -0500
committer Jonathan Stout <jonstout@indiana.edu> Tue Feb 04 12:07:10 2014 -0500
tree bdbf82c59237e7a0e92699823b91b80f08ec1f18
parent 7ebd4a91e3b467ff0c54fe45257dec676cadb30d

removing assertion on capability and logging fix

src/python/oftest/testutils.py

diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 571f18b..f1db91b 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -1707,13 +1707,15 @@
     test.assertEqual(res.type, ofp.OFPT_FEATURES_REPLY,
                      ("Unexpected packet type %d received in response to "
                       "OFPT_FEATURES_REQUEST") % res.type)
-    logging.info("Received features_request.")
+    logging.info("Received features_reply.")
     
-    logging.info("Verifying %s bit is set.", capability_str)
-    test.assertTrue((res.capabilities & capability) > 0,
-                    ("Capabilities bitmask does not support "
-                     "%s.") % capability_str)
-    logging.info(("Switch capabilities bitmask claims to support "
-                  "%s."), capability_str)
+    if (res.capabilities & capability) > 0:
+        logging.info("Switch capabilities bitmask claims to support %s",
+                     capability_str)
+        return True, res.capabilities
+    else:
+        logging.info("Capabilities bitmask does not support %s.",
+                     capability_str)
+        return False, res.capabilities
 
 __all__ = list(set(locals()) - _import_blacklist)