[pypy-commit] pypy stacklet: Improve the test, which shows that it doesn't work at all

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stacklet
Changeset: r46383:ee8568d22c26
Date: 2011-08-08 18:41 +0200
http://bitbucket.org/pypy/pypy/changeset/ee8568d22c26/

Log:	Improve the test, which shows that it doesn't work at all on
	shadowstack, after all.

diff --git a/pypy/rlib/test/test_rstacklet.py b/pypy/rlib/test/test_rstacklet.py
--- a/pypy/rlib/test/test_rstacklet.py
+++ b/pypy/rlib/test/test_rstacklet.py
@@ -199,7 +199,7 @@
     if len(argv) > 1:
         seed = int(argv[1])
     runner.init(seed)
-    for name, meth in runner.TESTS:
+    for name, meth in Runner.TESTS:
         print '-----', name, '-----'
         meth(runner)
     print '----- all done -----'
@@ -228,7 +228,6 @@
     def test_demo1(self):
         t, cbuilder = self.compile(entry_point)
 
-        expected_data = "----- all done -----\n"
         for i in range(15):
             if (i & 1) == 0:
                 env = {}
@@ -237,7 +236,9 @@
             print 'running %s/%s with arg=%d and env=%r' % (
                 self.gc, self.gcrootfinder, i, env)
             data = cbuilder.cmdexec('%d' % i, env=env)
-            assert data.endswith(expected_data)
+            assert data.endswith("----- all done -----\n")
+            for name, meth in Runner.TESTS:
+                assert ('----- %s -----\n' % name) in data
 
 
 class DONTTestStackletBoehm(BaseTestStacklet):