mirror of
https://github.com/GNS3/gns3-server.git
synced 2025-06-17 23:08:18 +00:00
Refactor tests
* Use pytest-aiohttp * Use the async def / await syntax. * Fix tests to run with Python 3.8
This commit is contained in:
grossmj
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright (C) 2016 GNS3 Technologies Inc.
|
||||
# Copyright (C) 2020 GNS3 Technologies Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -15,32 +15,31 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import os
|
||||
import json
|
||||
import pytest
|
||||
import socket
|
||||
import aiohttp
|
||||
import asyncio
|
||||
from unittest.mock import patch, MagicMock
|
||||
|
||||
from gns3server.controller.project import Project
|
||||
from gns3server.controller.compute import Compute, ComputeError, ComputeConflict
|
||||
from gns3server.version import __version__
|
||||
from gns3server.controller.compute import Compute, ComputeConflict
|
||||
from tests.utils import asyncio_patch, AsyncioMagicMock
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def compute(controller):
|
||||
|
||||
compute = Compute("my_compute_id", protocol="https", host="example.com", port=84, controller=controller)
|
||||
compute._connected = True
|
||||
return compute
|
||||
|
||||
|
||||
def test_init(compute):
|
||||
|
||||
assert compute.id == "my_compute_id"
|
||||
|
||||
|
||||
def test_getUrl(controller):
|
||||
|
||||
compute = Compute("my_compute_id", protocol="https", host="localhost", port=84, controller=controller)
|
||||
assert compute._getUrl("/test") == "https://localhost:84/v2/compute/test"
|
||||
# IPV6 localhost
|
||||
@ -56,6 +55,7 @@ def test_getUrl(controller):
|
||||
|
||||
|
||||
def test_get_url(controller):
|
||||
|
||||
compute = Compute("my_compute_id", protocol="https", host="localhost", port=84, controller=controller)
|
||||
with patch('gns3server.controller.compute.Compute._getUrl', return_value="returned") as getURL:
|
||||
assert compute.get_url("/test") == 'returned'
|
||||
@ -63,11 +63,13 @@ def test_get_url(controller):
|
||||
|
||||
|
||||
def test_host_ip(controller):
|
||||
|
||||
compute = Compute("my_compute_id", protocol="https", host="localhost", port=84, controller=controller)
|
||||
assert compute.host_ip == "127.0.0.1"
|
||||
|
||||
|
||||
def test_name():
|
||||
|
||||
c = Compute("my_compute_id", protocol="https", host="example.com", port=84, controller=MagicMock(), name=None)
|
||||
assert c.name == "https://example.com:84"
|
||||
c = Compute("world", protocol="https", host="example.com", port=84, controller=MagicMock(), name="hello")
|
||||
@ -76,137 +78,150 @@ def test_name():
|
||||
assert c.name == "https://azertyuiopq...@example.com:84"
|
||||
|
||||
|
||||
def test_compute_httpQuery(compute, async_run):
|
||||
async def test_compute_httpQuery(compute):
|
||||
|
||||
response = MagicMock()
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
response.status = 200
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
async_run(compute.close())
|
||||
await compute.post("/projects", {"a": "b"})
|
||||
await compute.close()
|
||||
mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
|
||||
assert compute._auth is None
|
||||
|
||||
|
||||
def test_compute_httpQueryAuth(compute, async_run):
|
||||
async def test_compute_httpQueryAuth(compute):
|
||||
|
||||
response = MagicMock()
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
response.status = 200
|
||||
|
||||
compute.user = "root"
|
||||
compute.password = "toor"
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
async_run(compute.close())
|
||||
await compute.post("/projects", {"a": "b"})
|
||||
await compute.close()
|
||||
mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=compute._auth, chunked=None, timeout=20)
|
||||
assert compute._auth.login == "root"
|
||||
assert compute._auth.password == "toor"
|
||||
|
||||
|
||||
def test_compute_httpQueryNotConnected(compute, controller, async_run):
|
||||
controller._notification = MagicMock()
|
||||
compute._connected = False
|
||||
response = AsyncioMagicMock()
|
||||
response.read = AsyncioMagicMock(return_value=json.dumps({"version": __version__}).encode())
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
|
||||
mock.assert_any_call("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
|
||||
#assert compute._connected
|
||||
assert compute._capabilities["version"] == __version__
|
||||
controller.notification.controller_emit.assert_called_with("compute.updated", compute.__json__())
|
||||
async_run(compute.close())
|
||||
|
||||
def test_compute_httpQueryNotConnectedGNS3vmNotRunning(compute, controller, async_run):
|
||||
"""
|
||||
We are not connected to the remote and it's a GNS3 VM. So we need to start it
|
||||
"""
|
||||
controller._notification = MagicMock()
|
||||
controller.gns3vm = AsyncioMagicMock()
|
||||
controller.gns3vm.running = False
|
||||
|
||||
compute._id = "vm"
|
||||
compute._connected = False
|
||||
response = AsyncioMagicMock()
|
||||
response.read = AsyncioMagicMock(return_value=json.dumps({"version": __version__}).encode())
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
|
||||
mock.assert_any_call("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
|
||||
|
||||
assert controller.gns3vm.start.called
|
||||
#assert compute._connected
|
||||
assert compute._capabilities["version"] == __version__
|
||||
controller.notification.controller_emit.assert_called_with("compute.updated", compute.__json__())
|
||||
async_run(compute.close())
|
||||
# async def test_compute_httpQueryNotConnected(compute, controller):
|
||||
#
|
||||
# controller._notification = MagicMock()
|
||||
# compute._connected = False
|
||||
# response = AsyncioMagicMock()
|
||||
# response.read = AsyncioMagicMock(return_value=json.dumps({"version": __version__}).encode())
|
||||
# response.status = 200
|
||||
# with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
# await compute.post("/projects", {"a": "b"})
|
||||
# mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
|
||||
# mock.assert_any_call("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
|
||||
# #assert compute._connected
|
||||
# assert compute._capabilities["version"] == __version__
|
||||
# controller.notification.controller_emit.assert_called_with("compute.updated", compute.__json__())
|
||||
# await compute.close()
|
||||
|
||||
|
||||
def test_compute_httpQueryNotConnectedInvalidVersion(compute, async_run):
|
||||
# async def test_compute_httpQueryNotConnectedGNS3vmNotRunning(compute, controller):
|
||||
# """
|
||||
# We are not connected to the remote and it's a GNS3 VM. So we need to start it
|
||||
# """
|
||||
#
|
||||
# controller._notification = MagicMock()
|
||||
# controller.gns3vm = AsyncioMagicMock()
|
||||
# controller.gns3vm.running = False
|
||||
#
|
||||
# compute._id = "vm"
|
||||
# compute._connected = False
|
||||
# response = AsyncioMagicMock()
|
||||
# response.read = AsyncioMagicMock(return_value=json.dumps({"version": __version__}).encode())
|
||||
# response.status = 200
|
||||
# with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
# await compute.post("/projects", {"a": "b"})
|
||||
# mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
|
||||
# mock.assert_any_call("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
|
||||
#
|
||||
# assert controller.gns3vm.start.called
|
||||
# #assert compute._connected
|
||||
# assert compute._capabilities["version"] == __version__
|
||||
# controller.notification.controller_emit.assert_called_with("compute.updated", compute.__json__())
|
||||
# await compute.close()
|
||||
|
||||
|
||||
async def test_compute_httpQueryNotConnectedInvalidVersion(compute):
|
||||
|
||||
compute._connected = False
|
||||
response = AsyncioMagicMock()
|
||||
response.read = AsyncioMagicMock(return_value=json.dumps({"version": "1.42.4"}).encode())
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
with pytest.raises(aiohttp.web.HTTPConflict):
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
await compute.post("/projects", {"a": "b"})
|
||||
mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
|
||||
async def test_compute_httpQueryNotConnectedNonGNS3Server(compute):
|
||||
|
||||
def test_compute_httpQueryNotConnectedNonGNS3Server(compute, async_run):
|
||||
compute._connected = False
|
||||
response = AsyncioMagicMock()
|
||||
response.read = AsyncioMagicMock(return_value=b'Blocked by super antivirus')
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
with pytest.raises(aiohttp.web.HTTPConflict):
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
await compute.post("/projects", {"a": "b"})
|
||||
mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
|
||||
async def test_compute_httpQueryNotConnectedNonGNS3Server2(compute):
|
||||
|
||||
def test_compute_httpQueryNotConnectedNonGNS3Server2(compute, async_run):
|
||||
compute._connected = False
|
||||
response = AsyncioMagicMock()
|
||||
response.read = AsyncioMagicMock(return_value=b'{}')
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
with pytest.raises(aiohttp.web.HTTPConflict):
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
await compute.post("/projects", {"a": "b"})
|
||||
mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
|
||||
|
||||
|
||||
def test_compute_httpQueryError(compute, async_run):
|
||||
async def test_compute_httpQueryError(compute):
|
||||
|
||||
response = MagicMock()
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
response.status = 404
|
||||
|
||||
with pytest.raises(aiohttp.web.HTTPNotFound):
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
async_run(compute.close())
|
||||
await compute.post("/projects", {"a": "b"})
|
||||
assert mock.called
|
||||
await compute.close()
|
||||
|
||||
|
||||
def test_compute_httpQueryConflictError(compute, async_run):
|
||||
async def test_compute_httpQueryConflictError(compute):
|
||||
|
||||
response = MagicMock()
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
response.status = 409
|
||||
response.read = AsyncioMagicMock(return_value=b'{"message": "Test"}')
|
||||
|
||||
with pytest.raises(ComputeConflict):
|
||||
async_run(compute.post("/projects", {"a": "b"}))
|
||||
async_run(compute.close())
|
||||
await compute.post("/projects", {"a": "b"})
|
||||
assert mock.called
|
||||
await compute.close()
|
||||
|
||||
|
||||
async def test_compute_httpQuery_project(compute):
|
||||
|
||||
def test_compute_httpQuery_project(compute, async_run):
|
||||
response = MagicMock()
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
response.status = 200
|
||||
|
||||
project = Project(name="Test")
|
||||
async_run(compute.post("/projects", project))
|
||||
await compute.post("/projects", project)
|
||||
mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=json.dumps(project.__json__()), headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
# FIXME: https://github.com/aio-libs/aiohttp/issues/2525
|
||||
# def test_connectNotification(compute, async_run):
|
||||
# ws_mock = AsyncioMagicMock()
|
||||
# async def test_connectNotification(compute):
|
||||
#
|
||||
# ws_mock = AsyncioMagicMock()
|
||||
# call = 0
|
||||
#
|
||||
# async def receive():
|
||||
@ -226,12 +241,12 @@ def test_compute_httpQuery_project(compute, async_run):
|
||||
# compute._http_session = AsyncioMagicMock(return_value=ws_mock)
|
||||
# compute._http_session.ws_connect = AsyncioMagicMock(return_value=ws_mock)
|
||||
# ws_mock.receive = receive
|
||||
# async_run(compute._connect_notification())
|
||||
# await compute._connect_notification()
|
||||
#
|
||||
# compute._controller.notification.dispatch.assert_called_with('test', {'a': 1}, compute_id=compute.id)
|
||||
# assert compute._connected is False
|
||||
#
|
||||
#
|
||||
|
||||
|
||||
# def test_connectNotificationPing(compute, async_run):
|
||||
# """
|
||||
# When we receive a ping from a compute we update
|
||||
@ -265,8 +280,8 @@ def test_compute_httpQuery_project(compute, async_run):
|
||||
# assert args[1]["memory_usage_percent"] == 80.7
|
||||
# assert args[1]["cpu_usage_percent"] == 35.7
|
||||
|
||||
async def test_json(compute):
|
||||
|
||||
def test_json(compute):
|
||||
compute.user = "test"
|
||||
assert compute.__json__() == {
|
||||
"compute_id": "my_compute_id",
|
||||
@ -293,28 +308,31 @@ def test_json(compute):
|
||||
}
|
||||
|
||||
|
||||
def test_downloadFile(project, async_run, compute):
|
||||
async def test_downloadFile(project, compute):
|
||||
|
||||
response = MagicMock()
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
async_run(compute.download_file(project, "test/titi"))
|
||||
await compute.download_file(project, "test/titi")
|
||||
mock.assert_called_with("GET", "https://example.com:84/v2/compute/projects/{}/files/test/titi".format(project.id), auth=None)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
|
||||
def test_close(compute, async_run):
|
||||
async def test_close(compute):
|
||||
|
||||
assert compute.connected is True
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
assert compute.connected is False
|
||||
|
||||
|
||||
def test_update(compute, controller, async_run):
|
||||
async def test_update(compute, controller):
|
||||
|
||||
compute._controller._notification = MagicMock()
|
||||
compute._controller.save = MagicMock()
|
||||
compute.name = "Test"
|
||||
compute.host = "example.org"
|
||||
compute._connected = True
|
||||
async_run(compute.update(name="Test 2"))
|
||||
await compute.update(name="Test 2")
|
||||
assert compute.name == "Test 2"
|
||||
assert compute.host == "example.org"
|
||||
controller.notification.controller_emit.assert_called_with("compute.updated", compute.__json__())
|
||||
@ -322,34 +340,42 @@ def test_update(compute, controller, async_run):
|
||||
assert compute._controller.save.called
|
||||
|
||||
|
||||
def test_forward_get(compute, async_run):
|
||||
async def test_forward_get(compute):
|
||||
|
||||
response = MagicMock()
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
async_run(compute.forward("GET", "qemu", "images"))
|
||||
await compute.forward("GET", "qemu", "images")
|
||||
mock.assert_called_with("GET", "https://example.com:84/v2/compute/qemu/images", auth=None, data=None, headers={'content-type': 'application/json'}, chunked=None, timeout=None)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
|
||||
async def test_forward_404(compute):
|
||||
|
||||
def test_forward_404(compute, async_run):
|
||||
response = MagicMock()
|
||||
response.status = 404
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
with pytest.raises(aiohttp.web_exceptions.HTTPNotFound):
|
||||
async_run(compute.forward("GET", "qemu", "images"))
|
||||
async_run(compute.close())
|
||||
await compute.forward("GET", "qemu", "images")
|
||||
assert mock.called
|
||||
await compute.close()
|
||||
|
||||
|
||||
async def test_forward_post(compute):
|
||||
|
||||
def test_forward_post(compute, async_run):
|
||||
response = MagicMock()
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
async_run(compute.forward("POST", "qemu", "img", data={"id": 42}))
|
||||
await compute.forward("POST", "qemu", "img", data={"id": 42})
|
||||
mock.assert_called_with("POST", "https://example.com:84/v2/compute/qemu/img", auth=None, data=b'{"id": 42}', headers={'content-type': 'application/json'}, chunked=None, timeout=None)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
def test_images(compute, async_run, images_dir):
|
||||
|
||||
async def test_images(compute):
|
||||
"""
|
||||
Will return image on compute
|
||||
"""
|
||||
|
||||
response = MagicMock()
|
||||
response.status = 200
|
||||
response.read = AsyncioMagicMock(return_value=json.dumps([{
|
||||
@ -358,26 +384,29 @@ def test_images(compute, async_run, images_dir):
|
||||
"md5sum": "d41d8cd98f00b204e9800998ecf8427e",
|
||||
"filesize": 0}]).encode())
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
images = async_run(compute.images("qemu"))
|
||||
images = await compute.images("qemu")
|
||||
mock.assert_called_with("GET", "https://example.com:84/v2/compute/qemu/images", auth=None, data=None, headers={'content-type': 'application/json'}, chunked=None, timeout=None)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
assert images == [
|
||||
{"filename": "linux.qcow2", "path": "linux.qcow2", "md5sum": "d41d8cd98f00b204e9800998ecf8427e", "filesize": 0}
|
||||
]
|
||||
|
||||
|
||||
def test_list_files(project, async_run, compute):
|
||||
async def test_list_files(project, compute):
|
||||
|
||||
res = [{"path": "test"}]
|
||||
response = AsyncioMagicMock()
|
||||
response.read = AsyncioMagicMock(return_value=json.dumps(res).encode())
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
assert async_run(compute.list_files(project)) == res
|
||||
assert await compute.list_files(project) == res
|
||||
mock.assert_any_call("GET", "https://example.com:84/v2/compute/projects/{}/files".format(project.id), auth=None, chunked=None, data=None, headers={'content-type': 'application/json'}, timeout=None)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
|
||||
async def test_interfaces(compute):
|
||||
|
||||
def test_interfaces(project, async_run, compute):
|
||||
res = [
|
||||
{
|
||||
"id": "vmnet99",
|
||||
@ -392,11 +421,13 @@ def test_interfaces(project, async_run, compute):
|
||||
response.read = AsyncioMagicMock(return_value=json.dumps(res).encode())
|
||||
response.status = 200
|
||||
with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
|
||||
assert async_run(compute.interfaces()) == res
|
||||
assert await compute.interfaces() == res
|
||||
mock.assert_any_call("GET", "https://example.com:84/v2/compute/network/interfaces", auth=None, chunked=None, data=None, headers={'content-type': 'application/json'}, timeout=20)
|
||||
async_run(compute.close())
|
||||
await compute.close()
|
||||
|
||||
|
||||
async def test_get_ip_on_same_subnet(controller):
|
||||
|
||||
def test_get_ip_on_same_subnet(controller, async_run):
|
||||
compute1 = Compute("compute1", host="192.168.1.1", controller=controller)
|
||||
compute1._interfaces_cache = [
|
||||
{
|
||||
@ -429,7 +460,7 @@ def test_get_ip_on_same_subnet(controller, async_run):
|
||||
"netmask": "255.255.255.0"
|
||||
}
|
||||
]
|
||||
assert async_run(compute1.get_ip_on_same_subnet(compute2)) == ("192.168.1.1", "192.168.1.2")
|
||||
assert await compute1.get_ip_on_same_subnet(compute2) == ("192.168.1.1", "192.168.1.2")
|
||||
|
||||
# Case 2 compute2 host is on a different network but a common interface is available
|
||||
compute2 = Compute("compute2", host="127.0.0.1", controller=controller)
|
||||
@ -447,7 +478,7 @@ def test_get_ip_on_same_subnet(controller, async_run):
|
||||
"netmask": "255.255.255.0"
|
||||
}
|
||||
]
|
||||
assert async_run(compute1.get_ip_on_same_subnet(compute2)) == ("192.168.1.1", "192.168.1.2")
|
||||
assert await compute1.get_ip_on_same_subnet(compute2) == ("192.168.1.1", "192.168.1.2")
|
||||
|
||||
#No common interface
|
||||
compute2 = Compute("compute2", host="127.0.0.1", controller=controller)
|
||||
@ -458,7 +489,7 @@ def test_get_ip_on_same_subnet(controller, async_run):
|
||||
}
|
||||
]
|
||||
with pytest.raises(ValueError):
|
||||
async_run(compute1.get_ip_on_same_subnet(compute2))
|
||||
await compute1.get_ip_on_same_subnet(compute2)
|
||||
|
||||
# Ignore 169.254 network because it's for Windows special purpose
|
||||
compute2 = Compute("compute2", host="192.168.1.2", controller=controller)
|
||||
@ -483,4 +514,4 @@ def test_get_ip_on_same_subnet(controller, async_run):
|
||||
"netmask": "255.255.0.0"
|
||||
},
|
||||
]
|
||||
assert async_run(compute1.get_ip_on_same_subnet(compute2)) == ('192.168.2.1', '192.168.1.2')
|
||||
assert await compute1.get_ip_on_same_subnet(compute2) == ('192.168.2.1', '192.168.1.2')
|
||||
|
||||
Reference in New Issue
Block a user