[Openais] [PATCH 4/4] CTS: get some more code to execute.

Angus Salkeld asalkeld at redhat.com
Wed Mar 24 13:38:55 PDT 2010


Signed-off-by: Angus Salkeld <asalkeld at redhat.com>
---
 cts/agents/mem_leak_test.sh |   13 +++++++++++++
 cts/corotests.py            |   33 +++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/cts/agents/mem_leak_test.sh b/cts/agents/mem_leak_test.sh
index 1bdb2b0..11a1cec 100755
--- a/cts/agents/mem_leak_test.sh
+++ b/cts/agents/mem_leak_test.sh
@@ -30,6 +30,7 @@ _object_test_()
 
   corosync-objctl -c usr
   corosync-objctl -w usr.angus=456
+  corosync-objctl -w usr.angus=4123
   corosync-objctl -d usr
 
   BEFORE=$(get_mem $TYPE)
@@ -64,6 +65,15 @@ _session_test_()
   echo _session_test_
   COUNT=1
 
+  corosync-objctl -h >/dev/null
+  corosync-cfgtool -h >/dev/null
+  corosync-quorumtool -h >/dev/null
+
+  BEFORE=$(get_mem $TYPE)
+  corosync-cfgtool -a >/dev/null
+  corosync-quorumtool -s >/dev/null
+  corosync-quorumtool -l >/dev/null
+
   find /usr/bin | sed "s|\.|_|g" | sed "s|/|.|g" | while read l
   do 
     corosync-objctl -c $l
@@ -71,6 +81,9 @@ _session_test_()
     let COUNT="$COUNT+1"
   done
   corosync-objctl -d usr
+  AFTER=$(get_mem $TYPE)
+  let DIFF="$AFTER - $BEFORE"
+  echo $DIFF
 
   exit 0
 }
diff --git a/cts/corotests.py b/cts/corotests.py
index 8fe5149..95bef01 100644
--- a/cts/corotests.py
+++ b/cts/corotests.py
@@ -249,9 +249,9 @@ class CpgMsgOrderBase(CoroTest):
             stopped = False
             waited = 0
 
-            while len(msgs[n]) < self.total_num_msgs and waited < 60:
+            while len(msgs[n]) < self.total_num_msgs and waited < 360:
 
-                msg = self.CM.cpg_agent[n].read_messages(25)
+                msg = self.CM.cpg_agent[n].read_messages(50)
                 if not msg == None:
                     msgl = msg.split(";")
 
@@ -265,8 +265,8 @@ class CpgMsgOrderBase(CoroTest):
 
                     msgs[n].extend(msgl)
                 elif msg == None:
-                    time.sleep(1)
-                    waited = waited + 1
+                    time.sleep(2)
+                    waited = waited + 2
 
             if len(msgs[n]) < self.total_num_msgs:
                 return self.failure("expected %d messages from %s got %d" % (self.total_num_msgs, n, len(msgs[n])))
@@ -518,7 +518,6 @@ AllTestClasses.append(RestartOnebyOne)
 def CoroTestList(cm, audits):
     result = []
     configs = []
-    empty = {}
 
     for testclass in AllTestClasses:
         bound_test = testclass(cm)
@@ -526,7 +525,12 @@ def CoroTestList(cm, audits):
             bound_test.Audits = audits
             result.append(bound_test)
 
-    configs.append(empty)
+    default = {}
+    default['logging/function_name'] = 'off'
+    default['logging/logfile_priority'] = 'info'
+    default['logging/syslog_priority'] = 'info'
+    default['logging/syslog_facility'] = 'daemon'
+    configs.append(default)
 
     a = {}
     a['compatibility'] = 'none'
@@ -558,6 +562,23 @@ def CoroTestList(cm, audits):
     #f['quorum/provider'] = 'corosync_quorum_ykd'
     #configs.append(f)
 
+
+    g = {}
+    g['totem/rrp_mode'] = 'passive'
+    g['totem/interface[2]/ringnumber'] = '1'
+    g['totem/interface[2]/bindnetaddr'] = '192.168.200.0'
+    g['totem/interface[2]/mcastaddr'] = '226.94.1.2'
+    g['totem/interface[2]/mcastport'] = '5405'
+    configs.append(g)
+
+    h = {}
+    h['totem/rrp_mode'] = 'active'
+    h['totem/interface[2]/ringnumber'] = '1'
+    h['totem/interface[2]/bindnetaddr'] = '192.168.200.0'
+    h['totem/interface[2]/mcastaddr'] = '226.94.1.2'
+    h['totem/interface[2]/mcastport'] = '5405'
+    configs.append(h)
+
     num=1
     for cfg in configs:
         for testclass in GenTestClasses:
-- 
1.6.6.1




More information about the Openais mailing list