[Gzz-commits] gzz/test testutil.py gzz/control/Gzz.test gzz/c...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/21 09:07:49

Modified files:
        test           : testutil.py 
        test/gzz/control: Gzz.test GzzGl.test 

Log message:
        Marking slow tests

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/testutil.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/control/Gzz.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/control/GzzGl.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/test/gzz/control/Gzz.test
diff -u gzz/test/gzz/control/Gzz.test:1.1 gzz/test/gzz/control/Gzz.test:1.2
--- gzz/test/gzz/control/Gzz.test:1.1   Sat Nov  9 10:07:08 2002
+++ gzz/test/gzz/control/Gzz.test       Thu Nov 21 09:07:49 2002
@@ -6,6 +6,10 @@
 import gzz, java
 
 def testStarts():
+    """Test that the AWT client starts.
+
+    cost: 10
+    """
     _exec = getattr(java.lang.Runtime.getRuntime(), 'exec')
     process = _exec(["make", "testclient"])
     if process.waitFor():
Index: gzz/test/gzz/control/GzzGl.test
diff -u gzz/test/gzz/control/GzzGl.test:1.1 gzz/test/gzz/control/GzzGl.test:1.2
--- gzz/test/gzz/control/GzzGl.test:1.1 Sat Nov  9 10:07:08 2002
+++ gzz/test/gzz/control/GzzGl.test     Thu Nov 21 09:07:49 2002
@@ -8,6 +8,10 @@
 import gzz, java
 
 def testStarts():
+    """Test that the GL client starts.
+
+    cost: 10
+    """
     _exec = getattr(java.lang.Runtime.getRuntime(), 'exec')
     process = _exec(["make", "testclient-gl"])
     if process.waitFor():
Index: gzz/test/testutil.py
diff -u gzz/test/testutil.py:1.39 gzz/test/testutil.py:1.40
--- gzz/test/testutil.py:1.39   Thu Nov 21 06:19:01 2002
+++ gzz/test/testutil.py        Thu Nov 21 09:07:49 2002
@@ -189,23 +189,33 @@
     else: return ""
 
 runfail = [None]
+maxcost = 4
 
 def shouldRun(obj):
-    print "shouldrun",obj
     if getattr(obj,"__doc__", None) == None: return 1
     doc = obj.__doc__
     m = re.search("\n\s*fail:\s*(.*?)\s*\n", doc)
     fail = None
-    print m, doc
     if m != None:
        fail = m.group(1)
-       print "TEST FAILS IN ", fail
+       print "TEST FAILS IN ", obj, fail
        if fail not in ["AWT", "GL", "*"]:
            raise str(("Invalid docstring fail message ",obj.__doc__))
-    if fail in runfail:
-       return 1
-    print "NOT RUNNING DUE TO WRONG F: ",obj
-    return 0
+    if not (fail in runfail):
+       print "NOT RUNNING DUE TO WRONG F: ",obj
+       return 0
+
+    m = re.search("\n\s*cost:\s*(.*?)\s*\n", doc)
+    cost = 0
+    if m != None:
+       cost = m.group(1)
+       print "TEST COST ",obj, cost
+    if cost > maxcost:
+       print "TOO COSTLY TEST", obj
+       return 0
+
+    # Then, check the cost of the test
+    return 1