[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
Wed Jun 8 14:54:37 CDT 2011


branch "review" has been updated
       via  0fcee61a1efeac16e4d7f719cbb02ee5f6dfb1ad (commit)
       via  177ebf770bbfc0dbe991a2ed6e42b32bdfc2541e (commit)
      from  53243344b0757fd555098b073c3653c238ff9255 (commit)

Summary of changes:
 tests/sip/Functional_Basic_CallSetup/testcase.yaml |   38 ++++++++++----------
 testsuite.py                                       |    4 ++-
 2 files changed, 22 insertions(+), 20 deletions(-)


- Log -----------------------------------------------------------------
commit 0fcee61a1efeac16e4d7f719cbb02ee5f6dfb1ad
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed Jun 8 14:54:35 2011 -0500

    Having an issue with the ipv4toipv4 subtest in that it fails when called from bamboo, but no locally. Mark and I are running some tests and have moved the ipv6toipv6 test to be the first test ran.

diff --git a/tests/sip/Functional_Basic_CallSetup/testcase.yaml b/tests/sip/Functional_Basic_CallSetup/testcase.yaml
index 77c1919..f604df6 100644
--- a/tests/sip/Functional_Basic_CallSetup/testcase.yaml
+++ b/tests/sip/Functional_Basic_CallSetup/testcase.yaml
@@ -4,7 +4,7 @@ options :
     call_flow_diagrams: True
     restart_persistant_plugins_between_tests: True
 tests :
-    - ipv4toipv4 :
+    - ipv6toipv6 :
         expected_failure : False 
         timeline:
             - asteriskscf_icebox :
@@ -12,6 +12,7 @@ tests :
                 cmd :
                     start :
                         - service_locator
+                        - logger_server
                         - bridge
                         - routing
                         - sip_session_gateway
@@ -21,31 +22,31 @@ tests :
                 configuration_wipe : False
                 cmd :
                     sip :
-                        - listen_udp4 :
+                        - listen_udp6 :
                             type : transport_udp
                             host : testsuite-remote-1.digium.internal
                             port : 5060
-                            ipv4oripv6 : ipv4
+                            ipv4oripv6 : ipv6
                         - service :
                             type : endpoint
                             targethost : testsuite-remote-2.digium.internal
                             targetport : 5060
                             sourcehost : testsuite-remote-1.digium.internal
                             sourceport : 5060
-                            ipv4oripv6 : ipv4
+                            ipv4oripv6 : ipv6
                             direction : both
                             securetransport : none
-                            rtpoveripv6 : False
+                            rtpoveripv6 : True
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
                             targetport : 5060
                             sourcehost : testsuite-remote-1.digium.internal
                             sourceport : 5060
-                            ipv4oripv6 : ipv4
+                            ipv4oripv6 : ipv6
                             direction : both
                             securetransport : none
-                            rtpoveripv6 : False
+                            rtpoveripv6 : True
                     rtp :
                          - general :
                             startport : 10001
@@ -56,7 +57,7 @@ tests :
                 cmd :
                     - uas :
                         transport : udp
-                        ipv4oripv6 : ipv4
+                        ipv4oripv6 : ipv6
                         timeout : 10
             - sipp:
                 testsuite_remote_host : testsuite-remote-3.digium.internal
@@ -66,10 +67,10 @@ tests :
                         cps : 1
                         duration : 10
                         targethost : testsuite-remote-1.digium.internal
-                        ipv4oripv6 : ipv4
+                        ipv4oripv6 : ipv6
                         transport : udp
                         timeout : 10
-    - ipv6toipv6 :
+    - ipv4toipv4 :
         expected_failure : False 
         timeline:
             - asteriskscf_icebox :
@@ -77,7 +78,6 @@ tests :
                 cmd :
                     start :
                         - service_locator
-                        - logger_server
                         - bridge
                         - routing
                         - sip_session_gateway
@@ -87,31 +87,31 @@ tests :
                 configuration_wipe : False
                 cmd :
                     sip :
-                        - listen_udp6 :
+                        - listen_udp4 :
                             type : transport_udp
                             host : testsuite-remote-1.digium.internal
                             port : 5060
-                            ipv4oripv6 : ipv6
+                            ipv4oripv6 : ipv4
                         - service :
                             type : endpoint
                             targethost : testsuite-remote-2.digium.internal
                             targetport : 5060
                             sourcehost : testsuite-remote-1.digium.internal
                             sourceport : 5060
-                            ipv4oripv6 : ipv6
+                            ipv4oripv6 : ipv4
                             direction : both
                             securetransport : none
-                            rtpoveripv6 : True
+                            rtpoveripv6 : False
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
                             targetport : 5060
                             sourcehost : testsuite-remote-1.digium.internal
                             sourceport : 5060
-                            ipv4oripv6 : ipv6
+                            ipv4oripv6 : ipv4
                             direction : both
                             securetransport : none
-                            rtpoveripv6 : True
+                            rtpoveripv6 : False
                     rtp :
                          - general :
                             startport : 10001
@@ -122,7 +122,7 @@ tests :
                 cmd :
                     - uas :
                         transport : udp
-                        ipv4oripv6 : ipv6
+                        ipv4oripv6 : ipv4
                         timeout : 10
             - sipp:
                 testsuite_remote_host : testsuite-remote-3.digium.internal
@@ -132,7 +132,7 @@ tests :
                         cps : 1
                         duration : 10
                         targethost : testsuite-remote-1.digium.internal
-                        ipv4oripv6 : ipv6
+                        ipv4oripv6 : ipv4
                         transport : udp
                         timeout : 10
     - ipv6toipv4 :

commit 177ebf770bbfc0dbe991a2ed6e42b32bdfc2541e
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed Jun 8 14:35:27 2011 -0500

    Modified the bamboo error message to better define what needs to be done with the url generated in addition to mentioning the artifacts tab.

diff --git a/testsuite.py b/testsuite.py
index 39a96d9..9dd3222 100755
--- a/testsuite.py
+++ b/testsuite.py
@@ -136,7 +136,9 @@ class __main__:
                                     print >> sys.stderr, '   |- Test "' + testName + '" - FAILED!\n    \- ' + runResults['msg']
                                     xmlFailureMsg = '%s' % runResults['msg']
                                     if 'bambooBuildURL' in self.globalVars:
-                                        xmlFailureMsg = '%s\nIf artifacts were generated, they can be found at the link below.\n\n%s%s' % (runResults['msg'], self.globalVars['bambooBuildURL'], self.globalVars['testInfo']['testPath'])
+                                        xmlFailureMsg = '%s\nIf artifacts specific to this test were generated,\n' % runResults['msg']
+                                        xmlFailureMsg = '%s they can be found pasting the link below in your browser or by clicking the Artifacts tab above.\n\n' % xmlFailureMsg
+                                        xmlFailureMsg = '%s%s%s' % (xmlFailureMsg, self.globalVars['bambooBuildURL'], self.globalVars['testInfo']['testPath'])
                                     subTestElement, errorMsgs = xml().addFailure(subTestElement, [xmlFailureMsg])
                                     if 'stop_tests_on_failure' in self.globalVars['testInfo']['testOpts']:
                                         if self.globalVars['testInfo']['testOpts']['stop_tests_on_failure'] == True:

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/testsuite.git



More information about the asterisk-scf-commits mailing list