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

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Apr 28 14:20:11 2010
New Revision: 257

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=257
Log:
disable second test and removed basicproperty import since it isn't needed

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=257&r1=256&r2=257
==============================================================================
--- asterisk/team/jpeeler/event_watcher/tests/ami-monitor/client.py (original)
+++ asterisk/team/jpeeler/event_watcher/tests/ami-monitor/client.py Wed Apr 28 14:20:11 2010
@@ -4,9 +4,8 @@
 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 EventWatcher(propertied.Propertied):
+
+class EventWatcher():
 
     def clear_vars(self):
  

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=257&r1=256&r2=257
==============================================================================
--- asterisk/team/jpeeler/event_watcher/tests/ami-monitor/test.py (original)
+++ asterisk/team/jpeeler/event_watcher/tests/ami-monitor/test.py Wed Apr 28 14:20:11 2010
@@ -8,7 +8,6 @@
 from starpy import manager, fastagi, utilapplication, menu
 import os, logging, pprint, time, sys
 from basicproperty import common, propertied, basic
-import subprocess
 
 class Test():
 
@@ -23,13 +22,13 @@
         watcher.add_send_event(event_send)
         print "ENDWOOT"
     
-    def test1(self, watcher):
-        print "WOOT2! - test1"
-        event1 = [{'response' : 'Success', 'ping' : 'Pong'}]
-        watcher.add_event(event1)
-        event_send = {'Action' : 'ping'}
-        watcher.add_send_event(event_send)
-        print "ENDWOOT2"
+    #def test1(self, watcher):
+    #    print "WOOT2! - test1"
+    #    event1 = [{'response' : 'Success', 'ping' : 'Pong'}]
+    #    watcher.add_event(event1)
+    #    event_send = {'Action' : 'ping'}
+    #    watcher.add_send_event(event_send)
+    #    print "ENDWOOT2"
 
     #def test2(self, watcher):
         #scenario 2 with optional event matching
@@ -41,9 +40,9 @@
         #watcher.add_event(event3)
         #watcher.set_ordered(True)
     
-        event1 = [{'event' : 'Alarm', 'channel' : '17' }]
-        event2 = [{'event' : 'Alarm', 'channel' : '18' }]
-        event3 = [{'event' : 'Alarm', 'channel' : '20' }, {'event' : 'Alarm', 'channel' : '19'}]
+        #event1 = [{'event' : 'Alarm', 'channel' : '17' }]
+        #event2 = [{'event' : 'Alarm', 'channel' : '18' }]
+        #event3 = [{'event' : 'Alarm', 'channel' : '20' }, {'event' : 'Alarm', 'channel' : '19'}]
         #watcher.add_event(event1)
         #watcher.add_event(event2)
         #watcher.add_event(event3)