[svn-commits] sgriepentrog: testsuite/asterisk/trunk r4775 - /asterisk/trunk/lib/python/ast...

[SVN commits to the Digium repositories]

Author: sgriepentrog
Date: Tue Mar  4 13:51:57 2014
New Revision: 4775

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4775
Log:
testsuite: eliminate version check zombies

While running the testsuite on a virtual machine, I noticed that
it would occasionally fail to start, complaining of being unable
to kill sipp (code introduced svn r4677 and rb 3198).  I tracked
this back to an instance of sipp that was run to get the version
number and was left as a zombie. This change adds a popen.wait()
to the version checks to insure that the zombies are truly dead.

Review: https://reviewboard.asterisk.org/r/3258/


Modified:
    asterisk/trunk/lib/python/asterisk/sippversion.py
    asterisk/trunk/lib/python/asterisk/version.py

Modified: asterisk/trunk/lib/python/asterisk/sippversion.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/sippversion.py?view=diff&rev=4775&r1=4774&r2=4775
==============================================================================
--- asterisk/trunk/lib/python/asterisk/sippversion.py (original)
+++ asterisk/trunk/lib/python/asterisk/sippversion.py Tue Mar  4 13:51:57 2014
@@ -54,6 +54,7 @@
                     version = sipp[0]
                     if len(sipp) > 1:
                         feature = sipp[1]
+            sipp_process.wait()
 
         if version is not None:
             self.__parse_version(version)

Modified: asterisk/trunk/lib/python/asterisk/version.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/version.py?view=diff&rev=4775&r1=4774&r2=4775
==============================================================================
--- asterisk/trunk/lib/python/asterisk/version.py (original)
+++ asterisk/trunk/lib/python/asterisk/version.py Tue Mar  4 13:51:57 2014
@@ -258,6 +258,7 @@
                 LOGGER.error("OSError [%d]: %s" % (o_excep.errno,
                                                    o_excep.strerror))
                 raise
+            process.wait()
             cls._asterisk_version_from_binary = version.replace("Asterisk ", "")
         return cls._asterisk_version_from_binary