[pypy-svn] rev 2441 - in pypy/trunk/src/pypy: module/test tool

[hpk at codespeak.net]

Author: hpk
Date: Wed Dec 17 14:56:02 2003
New Revision: 2441

Modified:
   pypy/trunk/src/pypy/module/test/test_newstyleclasses.py
   pypy/trunk/src/pypy/tool/test.py
Log:
- disabled the property test (to be reenabled soon)

- added a '-q' option to all test-scripts to allow 
  suppression of interp-level tracebacks



Modified: pypy/trunk/src/pypy/module/test/test_newstyleclasses.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_newstyleclasses.py	(original)
+++ pypy/trunk/src/pypy/module/test/test_newstyleclasses.py	Wed Dec 17 14:56:02 2003
@@ -36,16 +36,16 @@
         self.assertEquals(d.f("abc"), (D, "abc"))
         self.assertEquals(D.f("abc"), (D, "abc"))
 
-    def test_property_simple(self):
+    def xtest_property_simple(self):
         
         class a(object):
             def _get(self): return 42
             def _set(self, value): raise AttributeError
-            def _del(self, value): raise KeyError
+            def _del(self): raise KeyError
             name = property(_get, _set, _del)
         a1 = a()
         self.assertEquals(a1.name, 42)
-        self.assertRaises(AttributeError, setattr, a1, 'name')
+        self.assertRaises(AttributeError, setattr, a1, 'name', 42)
         self.assertRaises(KeyError, delattr, a1, 'name')
 
 if __name__ == '__main__':

Modified: pypy/trunk/src/pypy/tool/test.py
==============================================================================
--- pypy/trunk/src/pypy/tool/test.py	(original)
+++ pypy/trunk/src/pypy/tool/test.py	Wed Dec 17 14:56:02 2003
@@ -109,22 +109,19 @@
     def printErrorList(self, flavour, errors):
         from pypy.interpreter.baseobjspace import OperationError
         for test, err in errors:
-            if Options.showinterplevelexceptions:
+            t1, t2 = '', ''
+            if not Options.quiet:
                 self.stream.writeln(self.separator1)
                 self.stream.writeln("%s: %s" % (flavour,self.getDescription(test)))
                 self.stream.writeln(self.separator2)
                 t1 = self._exc_info_to_string(err)
-                t2 = ''
             if isinstance(err[1], OperationError) and \
               test.space.full_exceptions:
-                if Options.showinterplevelexceptions:
+                if not Options.quiet:
                     t2 = '\nand at app-level:\n\n'
-                else:
-                    t2 = ''
                 sio = StringIO.StringIO()
                 err[1].print_application_traceback(test.space, sio)
                 t2 += sio.getvalue()
-
             self.stream.writeln("%s" % (t1 + t2,))
 
 
@@ -264,8 +261,7 @@
     def ensure_value(*args):
         return 0
     ensure_value = staticmethod(ensure_value)
-    showinterplevelexceptions = 1
-
+    quiet = 0
 
 class TestSkip(Exception):
     pass
@@ -314,6 +310,9 @@
         '-i', action="store_true", dest="interactive",
         help="enter an interactive mode on failure or error"))
     options.append(make_option(
+        '-q', action="store_true", dest="quiet",
+        help="suppress some information (e.g. interpreter level exceptions)"))
+    options.append(make_option(
         '-c', action="store_true", dest="runcts",
         help="run CtsTestRunner (discards output and prints report "
              "after testing)"))