From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 25 Aug 2013 20:56:43 +0000 (+0300)
Subject: #18833: add a test for test_telnetlib.  Patch by Alex Volkov.
X-Git-Tag: v3.4.0a2~114^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f1353ab10792f47a51c37f1384f036a1679aec0;p=thirdparty%2FPython%2Fcpython.git

#18833: add a test for test_telnetlib.  Patch by Alex Volkov.
---

diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
index 11e95e77b75f..c9f2ccb462f8 100644
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -75,6 +75,14 @@ class GeneralTests(TestCase):
         self.assertEqual(telnet.sock.gettimeout(), 30)
         telnet.sock.close()
 
+    def testGetters(self):
+        # Test telnet getter methods
+        telnet = telnetlib.Telnet(HOST, self.port, timeout=30)
+        t_sock = telnet.sock
+        self.assertEqual(telnet.get_socket(), t_sock)
+        self.assertEqual(telnet.fileno(), t_sock.fileno())
+        telnet.sock.close()
+
 class SocketStub(object):
     ''' a socket proxy that re-defines sendall() '''
     def __init__(self, reads=()):
diff --git a/Misc/ACKS b/Misc/ACKS
index 78d3b47de944..9596db71d225 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1286,6 +1286,7 @@ Norman Vine
 Pauli Virtanen
 Frank Visser
 Johannes Vogel
+Alex Volkov
 Martijn Vries
 Sjoerd de Vries
 Niki W. Waibel