Skip to content

Commit

Permalink
fix: more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobowitz committed Mar 26, 2022
1 parent 9a30d05 commit 372a810
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
5 changes: 4 additions & 1 deletion jina/serve/networking.py
Original file line number Diff line number Diff line change
Expand Up @@ -826,4 +826,7 @@ def host_is_local(hostname):
if fqn in ("localhost", "0.0.0.0") or hostname == '0.0.0.0':
return True

return ipaddress.ip_address(hostname).is_loopback
try:
return ipaddress.ip_address(hostname).is_loopback
except ValueError:
return False
5 changes: 4 additions & 1 deletion tests/integration/deployments/test_deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,16 @@ async def test_deployments_with_replicas_advance_faster(port_generator):
graph_description = (
'{"start-gateway": ["deployment0"], "deployment0": ["end-gateway"]}'
)
deployments_addresses = f'{{"deployment0": ["0.0.0.0:{head_port}"]}}'

deployment = _create_regular_deployment(
port=head_port, name='deployment', executor='FastSlowExecutor', replicas=10
)
deployment.start()

ports = [args.port for args in deployment.pod_args['pods'][0]]
connections = [f'0.0.0.0:{port}' for port in ports]
deployments_addresses = f'{{"deployment0": {json.dumps(connections)}}}'

gateway_deployment = _create_gateway_deployment(
graph_description, deployments_addresses, port
)
Expand Down
5 changes: 3 additions & 2 deletions tests/k8s/test_k8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,11 +490,12 @@ def add(self, **kwargs):

args = set_deployment_parser().parse_args(['--uses', 'DocReplaceExecutor'])
with Deployment(args) as external_deployment:
ports = [args.port for args in external_deployment.pod_args['pods'][0]]
flow = Flow(name='k8s_flow-with_external_deployment', port=9090).add(
name='external_executor',
external=True,
host=f'172.17.0.1',
port=external_deployment.head_port,
port=ports[0],
)

namespace = 'test-flow-with-external-deployment'
Expand Down Expand Up @@ -550,7 +551,7 @@ async def test_flow_with_external_k8s_deployment(logger, docker_images, tmpdir):
flow = Flow(name='k8s_flow-with_external_deployment', port=9090).add(
name='external_executor',
external=True,
host='external-deployment-head.external-deployment-ns.svc',
host='external-deployment.external-deployment-ns.svc',
port=GrpcConnectionPool.K8S_PORT,
)

Expand Down

0 comments on commit 372a810

Please sign in to comment.