diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-08-19 16:09:47 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-08-19 16:09:47 -0700 |
| commit | d150b35464742de7af9b3105bc7eeb55171b96ee (patch) | |
| tree | f1dce9115efbe4c85d37bc27d6ae35f1e937a043 /tests/test_events.py | |
| parent | 21b7109c06695955632692814fed11b3717e0fc7 (diff) | |
| parent | e4240dd593207a5912de996c42451b3946f113b2 (diff) | |
| download | slixmpp-d150b35464742de7af9b3105bc7eeb55171b96ee.tar.gz slixmpp-d150b35464742de7af9b3105bc7eeb55171b96ee.tar.bz2 slixmpp-d150b35464742de7af9b3105bc7eeb55171b96ee.tar.xz slixmpp-d150b35464742de7af9b3105bc7eeb55171b96ee.zip | |
fixed todo merge
Diffstat (limited to 'tests/test_events.py')
| -rw-r--r-- | tests/test_events.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/test_events.py b/tests/test_events.py index 11821dbb..bbc5832e 100644 --- a/tests/test_events.py +++ b/tests/test_events.py @@ -1,14 +1,11 @@ -import unittest +import sleekxmpp +from . sleektest import * -class testevents(unittest.TestCase): - def setUp(self): - import sleekxmpp.stanza.presence as p - self.p = p +class TestEvents(SleekTest): def testEventHappening(self): "Test handler working" - import sleekxmpp c = sleekxmpp.ClientXMPP('crap@wherever', 'password') happened = [] def handletestevent(event): @@ -20,7 +17,6 @@ class testevents(unittest.TestCase): def testDelEvent(self): "Test handler working, then deleted and not triggered" - import sleekxmpp c = sleekxmpp.ClientXMPP('crap@wherever', 'password') happened = [] def handletestevent(event): @@ -32,4 +28,4 @@ class testevents(unittest.TestCase): self.failUnless(happened == [True], "event did not get triggered the correct number of times") -suite = unittest.TestLoader().loadTestsFromTestCase(testevents) +suite = unittest.TestLoader().loadTestsFromTestCase(TestEvents) |