From d7c231ba9eead992bfc8cb03e322a61001314775 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Sun, 13 Sep 2020 06:47:50 -0400
Subject: [PATCH] remove psutil
---
irctest/basecontrollers.py | 11 ++++++-----
requirements.txt | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
delete mode 100644 requirements.txt
diff --git a/irctest/basecontrollers.py b/irctest/basecontrollers.py
index 974bc23..9ea5b17 100644
--- a/irctest/basecontrollers.py
+++ b/irctest/basecontrollers.py
@@ -4,7 +4,6 @@ import socket
import tempfile
import time
import subprocess
-import psutil
from .runner import NotImplementedByController
@@ -84,7 +83,9 @@ class BaseServerController(_BaseController):
def wait_for_port(self):
while not self.port_open:
time.sleep(0.1)
- for conn in psutil.Process(self.proc.pid).connections():
- if conn.laddr[1] == self.port:
- self.port_open = True
-
+ try:
+ c = socket.create_connection(('localhost', self.port), timeout=1.0)
+ c.close()
+ self.port_open = True
+ except Exception as e:
+ continue
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 0f9a456..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-psutil >= 3.1.0 # Fixes #640