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

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue May 18 16:51:49 2010
New Revision: 297

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=297
Log:
decouple client module from ami-monitor configs

Modified:
    asterisk/team/jpeeler/event_watcher/lib/python/client.py

Modified: asterisk/team/jpeeler/event_watcher/lib/python/client.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/jpeeler/event_watcher/lib/python/client.py?view=diff&rev=297&r1=296&r2=297
==============================================================================
--- asterisk/team/jpeeler/event_watcher/lib/python/client.py (original)
+++ asterisk/team/jpeeler/event_watcher/lib/python/client.py Tue May 18 16:51:49 2010
@@ -114,6 +114,7 @@
         self.passed = True
         self.call_id = None
         self.timeout_sec = 5
+        self.working_dir = os.path.dirname(myargv[0])
 
         if len(myargv) == 1:
             self.standalone = True
@@ -129,9 +130,9 @@
             return
 
         self.log.info("Creating Asterisk instance...")
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/ami-monitor")
-        self.asterisk.install_config("tests/ami-monitor/configs/manager.conf")
-        self.asterisk.install_config("tests/ami-monitor/configs/logger.conf")
+        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/" + self.working_dir)
+        self.asterisk.install_config(self.working_dir + "/configs/manager.conf")
+        self.asterisk.install_config(self.working_dir + "/configs/logger.conf")
 
         self.start_asterisk()
 
@@ -211,7 +212,7 @@
         return len(d_subset) == len(set(d_subset.items()) & set(d_set.items()))
 
     def start(self):
-        utilapplication.UtilApplication.configFiles = (os.getcwd() + '/tests/ami-monitor/starpy.conf', 'starpy.conf')
+        utilapplication.UtilApplication.configFiles = (os.getcwd() + '/' + self.working_dir + '/starpy.conf', 'starpy.conf')
         # Log into AMI
         amiDF = utilapplication.UtilApplication().amiSpecifier.login().addCallbacks(self.on_connect, self.on_failure)