adding a real test counter and upping a timeout on a test

nimbusproject · Nov 7, 2010 · e4473ea · e4473ea
1 parent ce10d3a
commit e4473ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/tests/bt-tests.sh b/tests/bt-tests.sh
@@ -22,10 +22,18 @@ do
         error_cnt=`expr $error_cnt + 1`
         error_ts="$error_ts $t"
     else
-        cnt=`expr $cnt + 1`
+	x=`grep "Ran " $t.log  | grep " tests in " | sed "s/Ran //" | sed "s/tests in.*//"`
+        if [ "X$x" == "X" ]; then
+           cnt=`expr $cnt + 1`
+        else
+            for n in $x
+            do
+                cnt=`expr $cnt + $n`
+            done
+        fi
     fi
 done
-echo "$cnt parent tests passed (many more subtests were run)"
+echo "$cnt tests passed"
 echo "$error_cnt parent tests failed"
 echo "    $error_ts"
 

diff --git a/tests/cc-propsamename-test.py b/tests/cc-propsamename-test.py
@@ -5,7 +5,7 @@
 import os
 import filecmp
 
-to=90
+to=180
 
 cc_home=os.environ['CLOUD_CLIENT_HOME']
 logfile = sys.stdout
@@ -31,7 +31,7 @@
 
 cmd = "%s/bin/cloud-client.sh --handle %s --save" % (cc_home, handle)
 print cmd
-(x, rc)=pexpect.run(cmd, withexitstatus=1)
+(x, rc)=pexpect.run(cmd, withexitstatus=1, timeout=to, logfile=logfile)
 print x
 if rc != 0:
     print "failed to save"