Add support for timeout in function kwargs

I've added support for passing the timeout in kwargs, which means the client
code can decide the timeout. This is useful for functions that take a timeout
argument.

I've also made the tests proper and added nosetests as a requirement.

1 files changed, 33 insertions, 9 deletions

diff --git a/tests/test_timeout_decorator.py b/tests/test_timeout_decorator.py
index 35d0e3e..143dfc8 100644
--- a/tests/test_timeout_decorator.py
+++ b/tests/test_timeout_decorator.py
@@ -2,14 +2,38 @@
 # -*- coding: utf-8 -*-
 
 import time
-import timeout_decorator 
 
-@timeout_decorator.timeout(5)
-def mytest():
-    print "Start"
-    for i in range(1,10):
-        time.sleep(1)
-        print "%d seconds have passed" % i
+from nose.tools import raises
+
+from timeout_decorator import timeout, TimeoutError
+
+
+@raises(TimeoutError)
+def test_timeout_decorator_arg():
+    @timeout(1)
+    def f():
+        time.sleep(2)
+    f()
+
 
-if __name__ == '__main__':
-    mytest()
+@raises(TimeoutError)
+def test_timeout_kwargs():
+    @timeout()
+    def f(timeout):
+        time.sleep(2)
+    f(timeout=1)
+
+
+@raises(ValueError)
+def test_timeout_no_seconds():
+    @timeout()
+    def f(timeout):
+        time.sleep(2)
+    f()
+
+
+def test_timeout_ok():
+    @timeout(seconds=2)
+    def f():
+        time.sleep(1)
+    f()