From e0ed99cd7b940f78e7997c63469b73fc5f9259ad Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 9 Jul 2016 08:59:47 +0800
Subject: [PATCH] Revert "test/ctlmgr: keep trying to ping on OSError"

This reverts commit 375e821bd855e13fee9ba3ac3cb74c65320b4250.
---
 artiq/test/test_ctlmgr.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/artiq/test/test_ctlmgr.py b/artiq/test/test_ctlmgr.py
index a0a694740..5acdcc1f9 100644
--- a/artiq/test/test_ctlmgr.py
+++ b/artiq/test/test_ctlmgr.py
@@ -50,8 +50,7 @@ class ControllerCase(unittest.TestCase):
             except asyncio.TimeoutError:
                 timeout -= dt
             except (ConnectionAbortedError, ConnectionError,
-                    ConnectionRefusedError, ConnectionResetError,
-                    OSError):
+                    ConnectionRefusedError, ConnectionResetError):
                 await asyncio.sleep(dt)
                 timeout -= dt
         raise asyncio.TimeoutError