commit e55abf725e212af6708e7cbed639fbf451537662
author Rich Lane <rich.lane@bigswitch.com> Thu Jul 26 20:11:42 2012 -0700
committer Rich Lane <rich.lane@bigswitch.com> Thu Jul 26 20:11:42 2012 -0700
tree 28ad8c71352d9ea8d5474faae661c0b71aca90f1
parent c8aaa3e5376205cee5094d8c0d6dcb23cba8ea40

add --default-timeout option

src/python/oftest/ofutils.py

diff --git a/src/python/oftest/ofutils.py b/src/python/oftest/ofutils.py
index ce4e6ad..219ce4f 100644
--- a/src/python/oftest/ofutils.py
+++ b/src/python/oftest/ofutils.py
@@ -6,6 +6,8 @@
 import random
 import time
 
+default_timeout = None # set by oft
+
 def gen_xid():
     return random.randrange(1,0xffffffff)
 
@@ -19,7 +21,7 @@
 def timed_wait(cv, fn, timeout=-1):
     if timeout == -1:
         # TODO make this configurable
-        timeout = 2
+        timeout = default_timeout
 
     end_time = time.time() + timeout
     while True: