[svn-commits] jpeeler: branch jpeeler/event_watcher r259 - /asterisk/team/jpeeler/event_wat...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Apr 28 17:06:36 2010
New Revision: 259

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=259
Log:
make logging in work in testsuite and standalone

Modified:
    asterisk/team/jpeeler/event_watcher/tests/ami-monitor/client.py
    asterisk/team/jpeeler/event_watcher/tests/ami-monitor/test.py

Modified: asterisk/team/jpeeler/event_watcher/tests/ami-monitor/client.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/jpeeler/event_watcher/tests/ami-monitor/client.py?view=diff&rev=259&r1=258&r2=259
==============================================================================
--- asterisk/team/jpeeler/event_watcher/tests/ami-monitor/client.py (original)
+++ asterisk/team/jpeeler/event_watcher/tests/ami-monitor/client.py Wed Apr 28 17:06:36 2010
@@ -73,10 +73,9 @@
         return len(d_subset) == len(set(d_subset.items()) & set(d_set.items()))
 
     def main(self):
+        utilapplication.UtilApplication.configFiles = (os.getcwd() + '/tests/ami-monitor/starpy.conf', 'starpy.conf')
         # Log into AMI
-        amiDF = APPLICATION.amiSpecifier.login().addCallbacks(self.onAMIConnect, self.onAMIFailure)
-
-        self.show_events()
+        amiDF = utilapplication.UtilApplication().amiSpecifier.login().addCallbacks(self.onAMIConnect, self.onAMIFailure)
 
     def sendEvents(self, ami):
         if self.sendEventList:
@@ -190,8 +189,6 @@
             for event in events:
                 self.log.debug("Received event: %s", event)
 
-APPLICATION = utilapplication.UtilApplication()
-
 def main():
     logging.basicConfig()
 

Modified: asterisk/team/jpeeler/event_watcher/tests/ami-monitor/test.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/jpeeler/event_watcher/tests/ami-monitor/test.py?view=diff&rev=259&r1=258&r2=259
==============================================================================
--- asterisk/team/jpeeler/event_watcher/tests/ami-monitor/test.py (original)
+++ asterisk/team/jpeeler/event_watcher/tests/ami-monitor/test.py Wed Apr 28 17:06:36 2010
@@ -7,7 +7,6 @@
 from twisted.internet import reactor
 from starpy import manager, fastagi, utilapplication, menu
 import os, logging, pprint, time, sys
-from basicproperty import common, propertied, basic
 
 class Test():