git » libjio » commit 240bb7d

tests/behaviour: Remove gen_ret_after() in favor of gen_ret_seq()

author Alberto Bertogli
2009-07-15 18:48:18 UTC
committer Alberto Bertogli
2009-07-15 18:48:18 UTC
parent 4d14be7bb3c7f70b554a05afcba59538ef06068f

tests/behaviour: Remove gen_ret_after() in favor of gen_ret_seq()

gen_ret_seq() is much more readable and clear.

Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>

tests/behaviour/t_fi.py +1 -1
tests/behaviour/tf.py +0 -11

diff --git a/tests/behaviour/t_fi.py b/tests/behaviour/t_fi.py
index 6c36d40..332b82f 100644
--- a/tests/behaviour/t_fi.py
+++ b/tests/behaviour/t_fi.py
@@ -90,7 +90,7 @@ def test_f05():
 
 	def f1(f, jf):
 		fiu.enable_external("jio/commit/tf_opdata",
-				gen_ret_after(1, 0, 1))
+				gen_ret_seq((0, 1)))
 		t = jf.new_trans()
 		t.add(c, 0)
 		t.add(c, len(c) + 200)
diff --git a/tests/behaviour/tf.py b/tests/behaviour/tf.py
index ad793ea..a4fd9b9 100644
--- a/tests/behaviour/tf.py
+++ b/tests/behaviour/tf.py
@@ -215,17 +215,6 @@ class TransFile (object):
 					self.ops)
 
 
-def gen_ret_after(n, notyet, itstime):
-	"""Returns a function that returns value of notyet the first n
-	invocations, and itstime afterwards."""
-	holder = [n]
-	def newf(*args, **kwargs):
-		holder[0] -= 1
-		if holder[0] >= 0:
-			return notyet
-		return itstime
-	return newf
-
 def gen_ret_seq(seq):
 	"""Returns a function that each time it is called returns a value of
 	the given sequence, in order. When the sequence is exhausted, returns