Merge pull request #985 from lukpueh/quickfix-win-py27-tests

Fix failing AppVeyor Python2.7 tests

Author: lukpueh

setup.py

@@ -124,7 +124,6 @@
   packages = find_packages(exclude=['tests']),
   scripts = [
     'tuf/scripts/repo.py',
-    'tuf/scripts/client.py',
-    'tuf/scripts/simple_server.py',
+    'tuf/scripts/client.py'
   ]
 )

tests/simple_server.py

@@ -35,8 +35,10 @@
 
 import sys
 import random
+import platform
 
 import six
+from six.moves.SimpleHTTPServer import SimpleHTTPRequestHandler
 
 PORT = 0
 
@@ -55,7 +57,22 @@ def _port_gen():
 else:
   PORT = _port_gen()
 
-Handler = six.moves.SimpleHTTPServer.SimpleHTTPRequestHandler
-httpd = six.moves.socketserver.TCPServer(('', PORT), Handler)
+
+class QuietHTTPRequestHandler(SimpleHTTPRequestHandler):
+  """A SimpleHTTPRequestHandler that does not write incoming requests to
+  stderr. """
+  def log_request(self, code='-', size='-'):
+    pass
+
+# NOTE: On Windows/Python2 tests that use this simple_server.py in a
+# subprocesses hang after a certain amount of requests (~68), if a PIPE is
+# passed as Popen's stderr argument. As a simple workaround we silence the
+# server on those Windows/Py2 to not fill the buffer.
+if six.PY2 and platform.system() == 'Windows':
+  handler = QuietHTTPRequestHandler
+else:
+  handler = SimpleHTTPRequestHandler
+
+httpd = six.moves.socketserver.TCPServer(('', PORT), handler)
 
 httpd.serve_forever()

tests/test_multiple_repositories_integration.py

@@ -128,8 +128,8 @@ def setUp(self):
     while self.SERVER_PORT == self.SERVER_PORT2:
       self.SERVER_PORT2 = random.SystemRandom().randint(30000, 45000)
 
-    command = ['python', '-m', 'tuf.scripts.simple_server', str(self.SERVER_PORT)]
-    command2 = ['python', '-m', 'tuf.scripts.simple_server', str(self.SERVER_PORT2)]
+    command = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT)]
+    command2 = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT2)]
 
     self.server_process = subprocess.Popen(command, stderr=subprocess.PIPE,
         cwd=self.repository_directory)

tests/test_updater.py

@@ -98,7 +98,7 @@ def setUpClass(cls):
     # as a delegated role 'targets/role1', three target files, five key files,
     # etc.
     cls.SERVER_PORT = random.randint(30000, 45000)
-    command = ['python', '-m', 'tuf.scripts.simple_server', str(cls.SERVER_PORT)]
+    command = ['python', '-m', 'tests.simple_server', str(cls.SERVER_PORT)]
     cls.server_process = subprocess.Popen(command, stderr=subprocess.PIPE)
     logger.info('\n\tServer process started.')
     logger.info('\tServer process id: '+str(cls.server_process.pid))
@@ -1094,7 +1094,7 @@ def test_6_get_one_valid_targetinfo(self):
     # The SimpleHTTPServer started in the setupclass has a tendency to
     # timeout in Windows after a few tests.
     SERVER_PORT = random.randint(30000, 45000)
-    command = ['python', '-m', 'tuf.scripts.simple_server', str(SERVER_PORT)]
+    command = ['python', '-m', 'tests.simple_server', str(SERVER_PORT)]
     server_process = subprocess.Popen(command, stderr=subprocess.PIPE)
 
     # NOTE: Following error is raised if a delay is not long enough:
@@ -1361,7 +1361,7 @@ def test_7_updated_targets(self):
     # The SimpleHTTPServer started in the setupclass has a tendency to
     # timeout in Windows after a few tests.
     SERVER_PORT = random.randint(30000, 45000)
-    command = ['python', '-m', 'tuf.scripts.simple_server', str(SERVER_PORT)]
+    command = ['python', '-m', 'tests.simple_server', str(SERVER_PORT)]
     server_process = subprocess.Popen(command, stderr=subprocess.PIPE)
 
     # NOTE: Following error is raised if a delay is not long enough to allow
@@ -1493,7 +1493,7 @@ def test_8_remove_obsolete_targets(self):
     # The SimpleHTTPServer started in the setupclass has a tendency to
     # timeout in Windows after a few tests.
     SERVER_PORT = random.randint(30000, 45000)
-    command = ['python', '-m', 'tuf.scripts.simple_server', str(SERVER_PORT)]
+    command = ['python', '-m', 'tests.simple_server', str(SERVER_PORT)]
     server_process = subprocess.Popen(command, stderr=subprocess.PIPE)
 
     # NOTE: Following error is raised if a delay is not long enough to allow
@@ -1877,8 +1877,8 @@ def setUp(self):
     self.SERVER_PORT = 30001
     self.SERVER_PORT2 = 30002
 
-    command = ['python', '-m', 'tuf.scripts.simple_server', str(self.SERVER_PORT)]
-    command2 = ['python', '-m', 'tuf.scripts.simple_server', str(self.SERVER_PORT2)]
+    command = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT)]
+    command2 = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT2)]
 
     self.server_process = subprocess.Popen(command, stderr=subprocess.PIPE,
         cwd=self.repository_directory)