[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.

[Commits to the Asterisk SCF project code repositories]

branch "review" has been updated
       via  2397333b2869f584c86fc7b96acb44ca580c53e5 (commit)
      from  b740b183b12c79fddc522462bcde7c4ff0b01618 (commit)

Summary of changes:
 testsuite.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 2397333b2869f584c86fc7b96acb44ca580c53e5
Author: Darren Sessions <dsessions at digium.com>
Date:   Thu May 26 07:34:58 2011 -0500

    Updated the testsuite script to change the behavior of the shutdown code when a plugin needs to shutdown multiple items that span multiple remotes.

diff --git a/testsuite.py b/testsuite.py
index e6ab27d..a235426 100755
--- a/testsuite.py
+++ b/testsuite.py
@@ -71,19 +71,19 @@ class __main__:
                                 for timeLine in subTestCase[testName]['timeline']:
                                     for plugin in timeLine:
                                         runResults = util.plugins().execute(plugin, pluginData[plugin]['module'], timeLine[plugin], testData['path'])
-                                        if runResults['success'] == True:
-                                            if not 'shutdownList' in runResults:
-                                                if not 'shutdownExempt' in runResults:
-                                                    shutdownList.append({timeLine[plugin]['testsuite_remote']:plugin})
-                                            else:
-                                                for remote in runResults['shutdownList']:
-                                                    shutdownList.append({remote:plugin})
+                                        if not 'shutdownList' in runResults:
+                                            if not 'shutdownExempt' in runResults:
+                                               shutdownList.append({testData['testsuite_remote']:plugin})
                                         else:
+                                            for remote in runResults['shutdownList']:
+                                               shutdownList.append({remote:plugin})
+                                        if not runResults['success'] == True:
                                             break
                                     if runResults['success'] == False:
                                         runResults['msg'] = '%s: %s' % (plugin, runResults['msg'])
                                         break
 
+                                print shutdownList
                                 ''' shutdown if 'restart_persistant_plugins_between_tests' is true or not specified '''
                                 for d in shutdownList:
                                     for host in d:

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


-- 
asterisk-scf/integration/testsuite.git