← Back to branch summary

~ubuntu-branches/ubuntu/precise/python3.2/precise-proposed

« back to all changes in this revision

Viewing changes to Lib/test/test_poplib.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-03-09 18:40:39 UTC
  • mfrom: (30.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20120309184039-j3yk2emxr1plyo21
Tags: 3.2.3~rc1-1
http://bugs.debian.org/660146
* Python 3.2.3 release candidate 1.
* Update to 20120309 from the 3.2 branch.
* Fix libpython.a symlink. Closes: #660146.
* Build-depend on xauth.
* Run the gdb tests for the debug build only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/test/test_poplib.py
309
309
    def setUp(self):
310
310
        self.evt = threading.Event()
311
311
        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
312
 
        self.sock.settimeout(3)
 
312
        self.sock.settimeout(60)  # Safety net. Look issue 11812
313
313
        self.port = test_support.bind_port(self.sock)
314
 
        threading.Thread(target=self.server, args=(self.evt,self.sock)).start()
315
 
        time.sleep(.1)
316
 
 
317
 
    def tearDown(self):
 
314
        self.thread = threading.Thread(target=self.server, args=(self.evt,self.sock))
 
315
        self.thread.setDaemon(True)
 
316
        self.thread.start()
318
317
        self.evt.wait()
319
318
 
 
319
    def tearDown(self):
 
320
        self.thread.join()
 
321
        del self.thread  # Clear out any dangling Thread objects.
 
322
 
320
323
    def server(self, evt, serv):
321
324
        serv.listen(5)
 
325
        evt.set()
322
326
        try:
323
327
            conn, addr = serv.accept()
 
328
            conn.send(b"+ Hola mundo\n")
 
329
            conn.close()
324
330
        except socket.timeout:
325
331
            pass
326
 
        else:
327
 
            conn.send(b"+ Hola mundo\n")
328
 
            conn.close()
329
332
        finally:
330
333
            serv.close()
331
 
            evt.set()
332
334
 
333
335
    def testTimeoutDefault(self):
334
336
        self.assertTrue(socket.getdefaulttimeout() is None)
335
337
        socket.setdefaulttimeout(30)
336
338
        try:
337
 
            pop = poplib.POP3("localhost", self.port)
 
339
            pop = poplib.POP3(HOST, self.port)
338
340
        finally:
339
341
            socket.setdefaulttimeout(None)
340
342
        self.assertEqual(pop.sock.gettimeout(), 30)
351
353
        pop.sock.close()
352
354
 
353
355
    def testTimeoutValue(self):
354
 
        pop = poplib.POP3("localhost", self.port, timeout=30)
 
356
        pop = poplib.POP3(HOST, self.port, timeout=30)
355
357
        self.assertEqual(pop.sock.gettimeout(), 30)
356
358
        pop.sock.close()
357
359