[asterisk-commits] kmoore: testsuite/asterisk/trunk r3598 - in /asterisk/trunk: lib/python/aster...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Jan  4 09:50:23 2013
New Revision: 3598

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3598
Log:
Do some minor cleanup

This converts the tab to spaces in the AMIEventModule sample YAML
configuration and changes the id attribute for the originator module to
a string to be more consistent with how AMIEventModule defines its AMI
ID.

Modified:
    asterisk/trunk/lib/python/asterisk/PluggableModules.py
    asterisk/trunk/sample-yaml/ami-config.yaml.sample
    asterisk/trunk/sample-yaml/originator-config.yaml.sample

Modified: asterisk/trunk/lib/python/asterisk/PluggableModules.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/PluggableModules.py?view=diff&rev=3598&r1=3597&r2=3598
==============================================================================
--- asterisk/trunk/lib/python/asterisk/PluggableModules.py (original)
+++ asterisk/trunk/lib/python/asterisk/PluggableModules.py Fri Jan  4 09:50:23 2013
@@ -31,7 +31,7 @@
             'priority': '',
             'ignore-originate-failure': 'no',
             'trigger': 'scenario_start',
-            'id': 0
+            'id': '0'
         }
 
         # process config
@@ -45,7 +45,7 @@
     def ami_connect(self, ami):
         '''Handle new AMI connections.'''
         LOGGER.info("AMI %s connected" % (str(ami.id)))
-        if ami.id == self.config['id']:
+        if str(ami.id) == self.config['id']:
             self.ami = ami
             if self.config['trigger'] == 'ami_connect':
                 self.originate_call()

Modified: asterisk/trunk/sample-yaml/ami-config.yaml.sample
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/sample-yaml/ami-config.yaml.sample?view=diff&rev=3598&r1=3597&r2=3598
==============================================================================
--- asterisk/trunk/sample-yaml/ami-config.yaml.sample (original)
+++ asterisk/trunk/sample-yaml/ami-config.yaml.sample Fri Jan  4 09:50:23 2013
@@ -86,7 +86,7 @@
         # Normally, this should probably be the number of requirements specified
         # above.
         count: '2'
-	-
+    -
         # The "callback" type indicates that when event conditions are fulfilled
         # A callback should be called into. This is useful if pass/fail conditions
         # depend on more than just having specific headers match what is expected.

Modified: asterisk/trunk/sample-yaml/originator-config.yaml.sample
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/sample-yaml/originator-config.yaml.sample?view=diff&rev=3598&r1=3597&r2=3598
==============================================================================
--- asterisk/trunk/sample-yaml/originator-config.yaml.sample (original)
+++ asterisk/trunk/sample-yaml/originator-config.yaml.sample Fri Jan  4 09:50:23 2013
@@ -2,7 +2,7 @@
 
 originator-config:
     # The ID of the AMI instance on which to originate the call. (default: 0)
-    id: 0
+    id: '0'
 
     # The channel to originate. (default: 'Local/s at default')
     channel: 'Local/s at default'