From c3ae82d3743df7edc77a004475a82b9645360b6a Mon Sep 17 00:00:00 2001
From: Chris AtLee <catlee@mozilla.com>
Date: Thu, 25 Feb 2010 13:11:00 -0500
Subject: [PATCH] Fix debug_test to use module name and line numbers determined
 at runtime.

This fixes version-specific values in test_line_nofile, and also makes it
possible to run debug_test.py directly (not under nose).
---
 tests/debug_test.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/debug_test.py b/tests/debug_test.py
index c383ce4..61b4ba4 100644
--- a/tests/debug_test.py
+++ b/tests/debug_test.py
@@ -39,7 +39,7 @@ class TestSpew(TestCase):
         s(f, "line", None)
         lineno = f.f_lineno - 1 # -1 here since we called with frame f in the line above
         output = sys.stdout.getvalue()
-        self.failUnless("debug_test:%i" % lineno in output, "Didn't find line %i in %s" % (lineno, output))
+        self.failUnless("%s:%i" % (__name__, lineno) in output, "Didn't find line %i in %s" % (lineno, output))
         self.failUnless("f=<frame object at" in output)
 
     def test_line_nofile(self):
@@ -48,13 +48,10 @@ class TestSpew(TestCase):
         g = globals().copy()
         del g['__file__']
         f = eval("sys._getframe()", g)
+        lineno = f.f_lineno
         s(f, "line", None)
         output = sys.stdout.getvalue()
-        # version-dependent output here
-        if sys.version_info >= (2,5):
-            self.failUnless("[unknown]:1" in output, "Didn't find [unknown]:1 in %s" % (output))
-        else:
-            self.failUnless("[unknown]:0" in output, "Didn't find [unknown]:0 in %s" % (output))
+        self.failUnless("[unknown]:%i" % lineno in output, "Didn't find [unknown]:%i in %s" % (lineno, output))
         self.failUnless("VM instruction #" in output, output)
 
     def test_line_global(self):
@@ -65,7 +62,7 @@ class TestSpew(TestCase):
         GLOBAL_VAR(f, "line", None)
         lineno = f.f_lineno - 1 # -1 here since we called with frame f in the line above
         output = sys.stdout.getvalue()
-        self.failUnless("debug_test:%i" % lineno in output, "Didn't find line %i in %s" % (lineno, output))
+        self.failUnless("%s:%i" % (__name__, lineno) in output, "Didn't find line %i in %s" % (lineno, output))
         self.failUnless("f=<frame object at" in output)
         self.failUnless("GLOBAL_VAR" in f.f_globals)
         self.failUnless("GLOBAL_VAR=<eventlet.debug.Spew object at" in output)
@@ -78,7 +75,7 @@ class TestSpew(TestCase):
         s(f, "line", None)
         lineno = f.f_lineno - 1 # -1 here since we called with frame f in the line above
         output = sys.stdout.getvalue()
-        self.failUnless("debug_test:%i" % lineno in output, "Didn't find line %i in %s" % (lineno, output))
+        self.failUnless("%s:%i" % (__name__, lineno) in output, "Didn't find line %i in %s" % (lineno, output))
         self.failIf("f=<frame object at" in output)
 
     def test_line_nooutput(self):