[asterisk-commits] kmoore: testsuite/asterisk/trunk r5262 - /asterisk/trunk/lib/python/asterisk/

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Jul 18 08:40:38 2014
New Revision: 5262

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5262
Log:
Testsuite: Make sure that Asterisk is still stopped even if AMI can't be

Modified:
    asterisk/trunk/lib/python/asterisk/test_case.py

Modified: asterisk/trunk/lib/python/asterisk/test_case.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/test_case.py?view=diff&rev=5262&r1=5261&r2=5262
==============================================================================
--- asterisk/trunk/lib/python/asterisk/test_case.py (original)
+++ asterisk/trunk/lib/python/asterisk/test_case.py Fri Jul 18 08:40:38 2014
@@ -393,6 +393,12 @@
 
             # Call the overridable method now
             self.stop_asterisk()
+
+            if not isinstance(self.ami, list):
+                LOGGER.error("self.ami not iterable for teardown: %s"
+                    % str(self.ami))
+                __stop_instances(None)
+                return
 
             # tear down AMI instances
             ami_defers = []