[asterisk-commits] mjordan: testsuite/asterisk/trunk r3011 - in /asterisk/trunk: lib/python/aste...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jan 25 17:01:07 CST 2012


Author: mjordan
Date: Wed Jan 25 17:01:03 2012
New Revision: 3011

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3011
Log:
Fixed inverted test return

Modified:
    asterisk/trunk/lib/python/asterisk/sipp.py
    asterisk/trunk/tests/channels/SIP/codec_negotiation/run-test
    asterisk/trunk/tests/channels/SIP/message_auth/run-test
    asterisk/trunk/tests/channels/SIP/message_auth_cust_hdr/run-test
    asterisk/trunk/tests/channels/SIP/message_disabled/run-test
    asterisk/trunk/tests/channels/SIP/message_from_call/run-test
    asterisk/trunk/tests/channels/SIP/message_unauth/run-test
    asterisk/trunk/tests/channels/SIP/message_unauth_from/run-test
    asterisk/trunk/tests/channels/SIP/options/run-test

Modified: asterisk/trunk/lib/python/asterisk/sipp.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/sipp.py?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/lib/python/asterisk/sipp.py (original)
+++ asterisk/trunk/lib/python/asterisk/sipp.py Wed Jan 25 17:01:03 2012
@@ -211,14 +211,14 @@
             self.result.append(self.sipp[i].wait())
             logger.debug(self.stdout[i])
             if self.result[i]:
-                logger.warn("SIPp scenario #%d FAILED" % i)
+                logger.warn("SIPp scenario #%d (%s) FAILED" % (i, self.scenarios[i]['scenario']))
                 logger.warn(self.stderr[i])
                 passed = False
             else:
-                logger.info("SIPp scenario #%d PASSED" % i)
-
+                logger.info("SIPp scenario #%d (%s) PASSED" % (i,  self.scenarios[i]['scenario']))
+
+        self.stop_asterisk()
         self.stop_reactor()
-        self.stop_asterisk()
         if passed:
             return 0
         else:

Modified: asterisk/trunk/tests/channels/SIP/codec_negotiation/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/codec_negotiation/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/codec_negotiation/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/codec_negotiation/run-test Wed Jan 25 17:01:03 2012
@@ -49,7 +49,10 @@
     [update_entry(i) for i in SIPP_SCENARIOS]
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
+
+    return 0
 
 
 if __name__ == "__main__":

Modified: asterisk/trunk/tests/channels/SIP/message_auth/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/message_auth/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/message_auth/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/message_auth/run-test Wed Jan 25 17:01:03 2012
@@ -34,8 +34,10 @@
 def main():
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
 
+    return 0
 
 if __name__ == "__main__":
     sys.exit(main())

Modified: asterisk/trunk/tests/channels/SIP/message_auth_cust_hdr/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/message_auth_cust_hdr/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/message_auth_cust_hdr/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/message_auth_cust_hdr/run-test Wed Jan 25 17:01:03 2012
@@ -34,7 +34,10 @@
 def main():
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
+
+    return 0
 
 
 if __name__ == "__main__":

Modified: asterisk/trunk/tests/channels/SIP/message_disabled/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/message_disabled/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/message_disabled/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/message_disabled/run-test Wed Jan 25 17:01:03 2012
@@ -29,7 +29,10 @@
 def main():
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
+
+    return 0
 
 
 if __name__ == "__main__":

Modified: asterisk/trunk/tests/channels/SIP/message_from_call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/message_from_call/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/message_from_call/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/message_from_call/run-test Wed Jan 25 17:01:03 2012
@@ -34,7 +34,10 @@
 def main():
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
+
+    return 0
 
 
 if __name__ == "__main__":

Modified: asterisk/trunk/tests/channels/SIP/message_unauth/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/message_unauth/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/message_unauth/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/message_unauth/run-test Wed Jan 25 17:01:03 2012
@@ -34,7 +34,10 @@
 def main():
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
+
+    return 0
 
 
 if __name__ == "__main__":

Modified: asterisk/trunk/tests/channels/SIP/message_unauth_from/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/message_unauth_from/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/message_unauth_from/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/message_unauth_from/run-test Wed Jan 25 17:01:03 2012
@@ -65,7 +65,10 @@
 def main():
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
+
+    return 0
 
 
 if __name__ == "__main__":

Modified: asterisk/trunk/tests/channels/SIP/options/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/options/run-test?view=diff&rev=3011&r1=3010&r2=3011
==============================================================================
--- asterisk/trunk/tests/channels/SIP/options/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/options/run-test Wed Jan 25 17:01:03 2012
@@ -31,7 +31,10 @@
 def main():
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
-    return not test.passed
+    if not test.passed:
+        return 1
+
+    return 0
 
 
 if __name__ == "__main__":




More information about the asterisk-commits mailing list