[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jun 14 12:46:04 CDT 2011
branch "review" has been updated
via d7678f71a20688cb64222c1dc3d0758869e8f07f (commit)
via 05eb2fe0b1403febc7cb5ab3d91a4fea93a5457a (commit)
via e53b673a407ee9d5fed4ffdd94ca732c8d66cb00 (commit)
from 76ec1d6318b084581ee341d71ed1bc747535d7f9 (commit)
Summary of changes:
plugins/protos.py | 2 +-
plugins/testsuite_remotes.py | 12 ++++-
plugins/wireshark.py | 6 ++-
.../testcase.yaml | 53 ++++++++++++++++++++
4 files changed, 70 insertions(+), 3 deletions(-)
- Log -----------------------------------------------------------------
commit d7678f71a20688cb64222c1dc3d0758869e8f07f
Author: Darren Sessions <dsessions at digium.com>
Date: Tue Jun 14 12:46:01 2011 -0500
modified the startup procedures for the remotes so the remote python process is actually restarted so testing starts fresh from the ground up every single time.
diff --git a/plugins/testsuite_remotes.py b/plugins/testsuite_remotes.py
index 9d161c7..6b2b681 100644
--- a/plugins/testsuite_remotes.py
+++ b/plugins/testsuite_remotes.py
@@ -10,6 +10,7 @@
'''
+import time
import TestSuite
class plugin(TestSuite.BaseClass):
@@ -18,7 +19,16 @@ class plugin(TestSuite.BaseClass):
''' start and stop individual components. shutdown is implemented in the main testsuite code '''
for cmd in testData['cmd']:
if cmd == 'startup':
- ''' Quick check to make sure we can connect to the remotes before we do anything else. '''
+ ''' Restart remotes '''
+ for remote in testData['cmd']['startup']:
+ rpc[remote] = self.RPC().connect(remote)
+ if rpc[remote]['success'] == False:
+ return rpc[remote]
+ rpc[remote]['rpc']('restart')
+
+ time.sleep(5)
+
+ ''' Check to make sure we can connect to the remotes again before we do anything else. '''
for remote in testData['cmd']['startup']:
rpc[remote] = self.RPC().connect(remote)
if rpc[remote]['success'] == False:
commit 05eb2fe0b1403febc7cb5ab3d91a4fea93a5457a
Author: Darren Sessions <dsessions at digium.com>
Date: Tue Jun 14 12:44:52 2011 -0500
fixed a path issue from some earlier changes in the protos plugin.
diff --git a/plugins/protos.py b/plugins/protos.py
index a4f2b34..9302324 100644
--- a/plugins/protos.py
+++ b/plugins/protos.py
@@ -193,7 +193,7 @@ class plugin(TestSuite.RemoteBaseClass):
execCmd = [
'java',
'-jar',
- '!!CWD!!/3rdparty/c07-sip-r2.jar',
+ '!!CWD!!/3rdparty/PROTOS/c07-sip-r2.jar',
'-fromuri protos@%s' % remote[testData['cmd']['ipv4oripv6']],
'-touri targethost@%s' % targetHost[testData['cmd']['ipv4oripv6']],
'-validcase',
commit e53b673a407ee9d5fed4ffdd94ca732c8d66cb00
Author: Darren Sessions <dsessions at digium.com>
Date: Tue Jun 14 12:44:12 2011 -0500
added the call_flow_graph bool option in the yaml files so on big test batches (such as the protos testsuite) where graphs would be impractical, they are not generated and thus save large amounts of time.
diff --git a/plugins/wireshark.py b/plugins/wireshark.py
index 23eca56..ccb5b8a 100644
--- a/plugins/wireshark.py
+++ b/plugins/wireshark.py
@@ -69,6 +69,11 @@ class plugin(TestSuite.RemoteBaseClass):
results = remote['rpc']('moveFile', '/tmp/capture.pcap', '!!TMP!!/artifacts/%s/%s.capture.pcap' % (globalVars['testInfo']['testPath'], remote['hostname']))
if results['success'] == False:
return results
+
+ if testData['cmd']['stop']:
+ if 'call_flow_graph' in testData['cmd']['stop']:
+ if testData['cmd']['stop']['call_flow_graph'] == False:
+ return results
results = remote['rpc']('changeDir', 'artifacts/%s' % globalVars['testInfo']['testPath'])
if results['success'] == False:
@@ -102,4 +107,3 @@ class plugin(TestSuite.RemoteBaseClass):
src += 'src host ' + host + ' or '
capFilter.append('(dst host ' + hosts[n] + ' and ' + src.strip(' or ') + ')')
return '(' + ' or '.join(capFilter) + ')'
-
diff --git a/tests/sip/Stress_PROTOS_TestSuite_c07_sip_r2/testcase.yaml b/tests/sip/Stress_PROTOS_TestSuite_c07_sip_r2/testcase.yaml
index 49fef41..8217a9b 100644
--- a/tests/sip/Stress_PROTOS_TestSuite_c07_sip_r2/testcase.yaml
+++ b/tests/sip/Stress_PROTOS_TestSuite_c07_sip_r2/testcase.yaml
@@ -71,6 +71,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Request_URI :
expected_failure : False
timeline:
@@ -142,6 +143,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Version :
expected_failure : False
timeline:
@@ -213,6 +215,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Via_Host :
expected_failure : False
timeline:
@@ -284,6 +287,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Via_Host_Colon :
expected_failure : False
timeline:
@@ -355,6 +359,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Via_Host_Port :
expected_failure : False
timeline:
@@ -426,6 +431,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Via_Version :
expected_failure : False
timeline:
@@ -497,6 +503,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Via_Tag :
expected_failure : False
timeline:
@@ -568,6 +575,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_From_Display_Name :
expected_failure : False
timeline:
@@ -639,6 +647,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_From_Tag :
expected_failure : False
timeline:
@@ -710,6 +719,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_From_Colon :
expected_failure : False
timeline:
@@ -781,6 +791,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_From_URI :
expected_failure : False
timeline:
@@ -852,6 +863,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Contact_Display_Name :
expected_failure : False
timeline:
@@ -923,6 +935,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Contact_URI :
expected_failure : False
timeline:
@@ -994,6 +1007,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Contact_Left_Paranthesis :
expected_failure : False
timeline:
@@ -1065,6 +1079,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Contact_Right_paranthesis :
expected_failure : False
timeline:
@@ -1136,6 +1151,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_To :
expected_failure : False
timeline:
@@ -1207,6 +1223,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_To_Left_Paranthesis :
expected_failure : False
timeline:
@@ -1278,6 +1295,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_To_Right_Paranthesis :
expected_failure : False
timeline:
@@ -1349,6 +1367,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Call_Id_Value :
expected_failure : False
timeline:
@@ -1420,6 +1439,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Call_Id_At :
expected_failure : False
timeline:
@@ -1491,6 +1511,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Call_Id_Ip :
expected_failure : False
timeline:
@@ -1562,6 +1583,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Expires :
expected_failure : False
timeline:
@@ -1633,6 +1655,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Max_Forwards :
expected_failure : False
timeline:
@@ -1704,6 +1727,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Cseq_Integer :
expected_failure : False
timeline:
@@ -1775,6 +1799,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Cseq_String :
expected_failure : False
timeline:
@@ -1846,6 +1871,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Content_Type :
expected_failure : False
timeline:
@@ -1917,6 +1943,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Content_Length :
expected_failure : False
timeline:
@@ -1988,6 +2015,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SIP_Request_CRLF :
expected_failure : False
timeline:
@@ -2059,6 +2087,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- CRLF_Request :
expected_failure : False
timeline:
@@ -2130,6 +2159,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Attribute_CRLF :
expected_failure : False
timeline:
@@ -2201,6 +2231,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Proto_v_Identifier :
expected_failure : False
timeline:
@@ -2272,6 +2303,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Proto_v_Equal :
expected_failure : False
timeline:
@@ -2343,6 +2375,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Proto_v_Integer :
expected_failure : False
timeline:
@@ -2414,6 +2447,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Origin_Username :
expected_failure : False
timeline:
@@ -2485,6 +2519,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Origin_Session_Id :
expected_failure : False
timeline:
@@ -2556,6 +2591,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Origin_Network_Type :
expected_failure : False
timeline:
@@ -2627,6 +2663,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Origin_Ip :
expected_failure : False
timeline:
@@ -2698,6 +2735,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Session :
expected_failure : False
timeline:
@@ -2769,6 +2807,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Connection_Network_Type :
expected_failure : False
timeline:
@@ -2840,6 +2879,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Connection_Ip :
expected_failure : False
timeline:
@@ -2911,6 +2951,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Time_Start :
expected_failure : False
timeline:
@@ -2982,6 +3023,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Time_Stop :
expected_failure : False
timeline:
@@ -3053,6 +3095,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Media_Media :
expected_failure : False
timeline:
@@ -3124,6 +3167,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Media_Port :
expected_failure : False
timeline:
@@ -3195,6 +3239,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Media_Transport :
expected_failure : False
timeline:
@@ -3266,6 +3311,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Media_Type :
expected_failure : False
timeline:
@@ -3337,6 +3383,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Attribute_Rtpmap :
expected_failure : False
timeline:
@@ -3408,6 +3455,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Attribute_Colon :
expected_failure : False
timeline:
@@ -3479,6 +3527,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Attribute_Payload_Type :
expected_failure : False
timeline:
@@ -3550,6 +3599,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Attribute_Encoding_Name :
expected_failure : False
timeline:
@@ -3621,6 +3671,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Attribute_Slash :
expected_failure : False
timeline:
@@ -3692,6 +3743,7 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
- SDP_Attribute_Clock_Rate :
expected_failure : False
timeline:
@@ -3763,3 +3815,4 @@ tests :
testsuite_remote_host : testsuite-remote-1.digium.internal
cmd :
stop :
+ call_flow_graph : False
-----------------------------------------------------------------------
--
asterisk-scf/integration/testsuite.git
More information about the asterisk-scf-commits
mailing list