Fix Pytest failures

This commit is contained in:
Gaute Lindkvist
2019-10-09 10:30:07 +02:00
parent 411e5cf49f
commit 9f0cf91789
6 changed files with 37 additions and 18 deletions

View File

@@ -39,6 +39,21 @@ class Instance:
my_socket.settimeout(0.2)
return my_socket.connect_ex(('localhost', port)) == 0
@staticmethod
def __is_valid_port(port):
location = "localhost:" + str(port)
channel = grpc.insecure_channel(location,
options=[
('grpc.enable_http_proxy',
False)
])
app = App_pb2_grpc.AppStub(channel)
try:
app.GetVersion(Empty(), timeout=1)
except grpc.RpcError:
return False
return True
@staticmethod
def launch(resinsight_executable='',
console=False,
@@ -75,8 +90,10 @@ class Instance:
' RESINSIGHT_EXECUTABLE is not set')
return None
while Instance.__is_port_in_use(port):
print("Trying port " + str(port))
while Instance.__is_port_in_use(port):
port += 1
print("Trying port " + str(port))
print('Port ' + str(port))
print('Trying to launch', resinsight_executable)
@@ -116,11 +133,13 @@ class Instance:
"""
port_env = os.environ.get('RESINSIGHT_GRPC_PORT')
if port_env:
print("Got port " + port_env + " from environment")
start_port = int(port_env)
end_port = start_port + 20
for try_port in range(start_port, end_port):
if Instance.__is_port_in_use(try_port):
print("Trying port " + str(try_port))
if Instance.__is_port_in_use(try_port) and Instance.__is_valid_port(try_port):
return Instance(port=try_port)
print(
@@ -159,7 +178,7 @@ class Instance:
self.commands = CmdRpc.CommandsStub(self.channel)
# Main version check package
self.app = self.app = App_pb2_grpc.AppStub(self.channel)
self.app = App_pb2_grpc.AppStub(self.channel)
connection_ok = False
version_ok = False