Fix [Errno 111] Connection refused

Fixes issue: #1010

When running the tests this error appears
"[Errno 111] Connection refused". After some digging Lukas
found another error "No module named tests.simple_server"
which is the root case for error 111.

With the help of Joshua Lock, we found out that the simple_server.py
was not being found because subprocess.Popen was being passed
a cwd kwarg which moved the current working directory
away from tuf/tests.

Signed-off-by: Martin Vrachev <[email protected]>

Author: MVrachev

tests/test_multiple_repositories_integration.py

@@ -128,8 +128,13 @@ def setUp(self):
     while self.SERVER_PORT == self.SERVER_PORT2:
       self.SERVER_PORT2 = random.SystemRandom().randint(30000, 45000)
 
-    command = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT)]
-    command2 = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT2)]
+    # Needed because in some tests simple_server.py cannot be found.
+    # The reason is that the current working directory
+    # has been changed when executing a subprocess.
+    SIMPLE_SERVER_PATH = os.path.join(os.getcwd(), 'simple_server.py')
+
+    command = ['python', SIMPLE_SERVER_PATH, str(self.SERVER_PORT)]
+    command2 = ['python', SIMPLE_SERVER_PATH, str(self.SERVER_PORT2)]
 
     self.server_process = subprocess.Popen(command, stderr=subprocess.PIPE,
         cwd=self.repository_directory)

tests/test_updater.py

@@ -90,6 +90,11 @@ def setUpClass(cls):
     # temporary files are always removed, even when exceptions occur.
     cls.temporary_directory = tempfile.mkdtemp(dir=os.getcwd())
 
+    # Needed because in some tests simple_server.py cannot be found.
+    # The reason is that the current working directory
+    # has been changed when executing a subprocess.
+    cls.SIMPLE_SERVER_PATH = os.path.join(os.getcwd(), 'simple_server.py')
+
     # Launch a SimpleHTTPServer (serves files in the current directory).
     # Test cases will request metadata and target files that have been
     # pre-generated in 'tuf/tests/repository_data', which will be served
@@ -98,7 +103,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', 'tests.simple_server', str(cls.SERVER_PORT)]
+    command = ['python', cls.SIMPLE_SERVER_PATH, 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))
@@ -1091,7 +1096,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', 'tests.simple_server', str(SERVER_PORT)]
+    command = ['python', self.SIMPLE_SERVER_PATH, str(SERVER_PORT)]
     server_process = subprocess.Popen(command, stderr=subprocess.PIPE)
 
     # NOTE: Following error is raised if a delay is not long enough:
@@ -1359,7 +1364,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', 'tests.simple_server', str(SERVER_PORT)]
+    command = ['python', self.SIMPLE_SERVER_PATH, 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
@@ -1491,7 +1496,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', 'tests.simple_server', str(SERVER_PORT)]
+    command = ['python', self.SIMPLE_SERVER_PATH, 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
@@ -1824,6 +1829,11 @@ def setUp(self):
     self.temporary_repository_root = self.make_temp_directory(directory=
         self.temporary_directory)
 
+    # Needed because in some tests simple_server.py cannot be found.
+    # The reason is that the current working directory
+    # has been changed when executing a subprocess.
+    self.SIMPLE_SERVER_PATH = os.path.join(os.getcwd(), 'simple_server.py')
+
     # The original repository, keystore, and client directories will be copied
     # for each test case.
     original_repository = os.path.join(original_repository_files, 'repository')
@@ -1875,8 +1885,8 @@ def setUp(self):
     self.SERVER_PORT = 30001
     self.SERVER_PORT2 = 30002
 
-    command = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT)]
-    command2 = ['python', '-m', 'tests.simple_server', str(self.SERVER_PORT2)]
+    command = ['python', self.SIMPLE_SERVER_PATH, str(self.SERVER_PORT)]
+    command2 = ['python', self.SIMPLE_SERVER_PATH, str(self.SERVER_PORT2)]
 
     self.server_process = subprocess.Popen(command, stderr=subprocess.PIPE,
         cwd=self.repository_directory)