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: v2.7.6rc1~192
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=290c6b3446f5a1ecd76e0213e4db388a37ee9e55;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 7fdb49e8e62e..a5ed34bfa903 100644
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -92,6 +92,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()
+
 def _read_setUp(self):
     self.evt = threading.Event()
     self.dataq = Queue.Queue()
diff --git a/Misc/ACKS b/Misc/ACKS
index c6c2e2f2396e..6a0639663135 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1073,6 +1073,7 @@ Kurt Vile
 Norman Vine
 Frank Visser
 Johannes Vogel
+Alex Volkov
 Martijn Vries
 Niki W. Waibel
 Wojtek Walczak