Merged PR 117

2 files changed, 12 insertions, 4 deletions

diff --git a/t/test.py b/t/test.py
index b0bf7fa..f7ca98e 100644
--- a/t/test.py
+++ b/t/test.py
@@ -185,7 +185,11 @@ class TestTftpyState(unittest.TestCase):
         else:
             server.listen('localhost', 20001)
 
-    def clientServerDownloadOptions(self, options, output='/tmp/out'):
+    def clientServerDownloadOptions(self,
+                                    options,
+                                    output='/tmp/out',
+                                    cretries=tftpy.DEF_TIMEOUT_RETRIES,
+                                    sretries=tftpy.DEF_TIMEOUT_RETRIES):
         """Fire up a client and a server and do a download."""
         root = os.path.dirname(os.path.abspath(__file__))
         server = tftpy.TftpServer(root)
@@ -199,13 +203,14 @@ class TestTftpyState(unittest.TestCase):
             try:
                 time.sleep(1)
                 client.download('640KBFILE',
-                                output)
+                                output,
+                                retries=cretries)
             finally:
                 os.kill(child_pid, 15)
                 os.waitpid(child_pid, 0)
 
         else:
-            server.listen('localhost', 20001)
+            server.listen('localhost', 20001, retries=sretries)
 
     @contextmanager
     def dummyServerDir(self):
@@ -223,6 +228,9 @@ class TestTftpyState(unittest.TestCase):
     def testClientServerNoOptions(self):
         self.clientServerDownloadOptions({})
 
+    def testClientServerNoOptionsRetries(self):
+        self.clientServerDownloadOptions({}, cretries=5, sretries=5)
+
     def testClientServerTsizeOptions(self):
         self.clientServerDownloadOptions({'tsize': 64*1024})
 
diff --git a/tftpy/TftpShared.py b/tftpy/TftpShared.py
index 734b263..7f618e9 100644
--- a/tftpy/TftpShared.py
+++ b/tftpy/TftpShared.py
@@ -9,7 +9,7 @@ DEF_BLKSIZE = 512
 MAX_BLKSIZE = 65536
 SOCK_TIMEOUT = 5
 MAX_DUPS = 20
-DEF_TIMEOUT_RETRIES = 5
+DEF_TIMEOUT_RETRIES = 3
 DEF_TFTP_PORT = 69
 
 # A hook for deliberately introducing delay in testing.