Revision: 3241
http://spambayes.svn.sourceforge.net/spambayes/?rev=3241&view=rev
Author: montanaro
Date: 2009-02-20 06:54:04 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
Slight tweak to help running tests under nose.
Modified Paths:
--------------
trunk/spambayes/spambayes/test/test_sb_server.py
Modified: trunk/spambayes/spambayes/test/test_sb_server.py
===================================================================
--- trunk/spambayes/spambayes/test/test_sb_server.py 2009-02-20 06:52:54 UTC
(rev 3240)
+++ trunk/spambayes/spambayes/test/test_sb_server.py 2009-02-20 06:54:04 UTC
(rev 3241)
@@ -103,7 +103,7 @@
# Our simulated slow POP3 server transmits about 100 characters per second.
PER_CHAR_DELAY = 0.01
-class TestListener(Dibbler.Listener):
+class Listener(Dibbler.Listener):
"""Listener for TestPOP3Server. Works on port 8110, to co-exist
with real POP3 servers."""
@@ -253,7 +253,7 @@
return "-ERR Unknown command: %s\r\n" % repr(command)
-def test():
+def helper():
"""Runs a self-test using TestPOP3Server, a minimal POP3 server
that serves the example emails above.
"""
@@ -264,7 +264,7 @@
testServerReady = threading.Event()
def runTestServer():
testSocketMap = {}
- TestListener(socketMap=testSocketMap)
+ Listener(socketMap=testSocketMap)
testServerReady.set()
asyncore.loop(map=testSocketMap)
@@ -369,7 +369,7 @@
pop3Server.sendall("kill\r\n")
pop3Server.recv(100)
-def run():
+def test_run():
# Read the arguments.
try:
opts, args = getopt.getopt(sys.argv[1:], 'ht')
@@ -393,14 +393,14 @@
if runSelfTest:
print "\nRunning self-test...\n"
state.buildServerStrings()
- test()
+ helper()
print "Self-test passed." # ...else it would have asserted.
elif state.runTestServer:
print "Running a test POP3 server on port 8110..."
- TestListener()
+ Listener()
asyncore.loop()
if __name__ == '__main__':
- run()
+ test_run()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Spambayes-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/spambayes-checkins
