Fixed unit test

Author: eeaston

pytest-server-fixtures/tests/integration/test_httpd_proxy_server.py

@@ -2,7 +2,7 @@
 
 def test_start_and_stop(httpd_server):
     assert httpd_server.check_server_up()
-    pid = int((httpd_server.workspace / 'run' / 'httpd.pid').read_text())
+    pid = httpd_server.pid
     httpd_server.kill()
     assert not httpd_server.check_server_up()
     still_running = [i for i in psutil.process_iter()

pytest-server-fixtures/tests/unit/test_server_unit.py

@@ -27,11 +27,10 @@ def test_kill():
                            hostname=sentinel.hostname,
                            port=sentinel.port)
     self.run.side_effect = ['100\n', '', '']
-    with patch('os.kill') as kill:
-        with patch('socket.gethostbyname', return_value=sentinel.ip):
-            _TestServer._find_and_kill_by_port(self, 2, sentinel.signal)
+    with patch('socket.gethostbyname', return_value=sentinel.ip):
+        _TestServer._find_and_kill_by_port(self, 2, sentinel.signal)
     assert self.run.call_args_list == [call("netstat -anp 2>/dev/null | grep sentinel.ip:sentinel.port "
                                             "| grep LISTEN | awk '{ print $7 }' | cut -d'/' -f1", capture=True, cd='/'),
                                        call("netstat -anp 2>/dev/null | grep sentinel.ip:sentinel.port "
                                             "| grep LISTEN | awk '{ print $7 }' | cut -d'/' -f1", capture=True, cd='/')]
-    assert kill.call_args_list == [call(100, sentinel.signal)]
+    assert self._signal.call_args_list == [call(100, sentinel.signal)]