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
2020-06-16 13:59:03 +09:30
parent f498ab06b4
commit d3ea67da24
87 changed files with 3697 additions and 3528 deletions

View File

@ -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
@ -19,27 +19,26 @@ import unittest
from tests.utils import asyncio_patch
def test_compute_create_without_id(http_controller, controller):
async def test_compute_create_without_id(controller_api, controller):
params = {
"protocol": "http",
"host": "localhost",
"port": 84,
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params, example=True)
"password": "secure"}
response = await controller_api.post("/computes", params)
assert response.status == 201
assert response.route == "/computes"
assert response.json["user"] == "julien"
assert response.json["compute_id"] is not None
assert "password" not in response.json
assert len(controller.computes) == 1
assert controller.computes[response.json["compute_id"]].host == "localhost"
def test_compute_create_with_id(http_controller, controller):
async def test_compute_create_with_id(controller_api, controller):
params = {
"compute_id": "my_compute_id",
@ -47,9 +46,9 @@ def test_compute_create_with_id(http_controller, controller):
"host": "localhost",
"port": 84,
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params, example=True)
"password": "secure"}
response = await controller_api.post("/computes", params)
assert response.status == 201
assert response.route == "/computes"
assert response.json["user"] == "julien"
@ -59,7 +58,7 @@ def test_compute_create_with_id(http_controller, controller):
assert controller.computes["my_compute_id"].host == "localhost"
def test_compute_get(http_controller, controller):
async def test_compute_get(controller_api):
params = {
"compute_id": "my_compute_id",
@ -69,15 +68,16 @@ def test_compute_get(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
response = http_controller.get("/computes/my_compute_id", example=True)
response = await controller_api.get("/computes/my_compute_id")
assert response.status == 200
assert response.json["protocol"] == "http"
def test_compute_update(http_controller, controller):
async def test_compute_update(controller_api):
params = {
"compute_id": "my_compute_id",
@ -87,21 +87,22 @@ def test_compute_update(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
response = http_controller.get("/computes/my_compute_id")
response = await controller_api.get("/computes/my_compute_id")
assert response.status == 200
assert response.json["protocol"] == "http"
params["protocol"] = "https"
response = http_controller.put("/computes/my_compute_id", params, example=True)
response = await controller_api.put("/computes/my_compute_id", params)
assert response.status == 200
assert response.json["protocol"] == "https"
def test_compute_list(http_controller, controller):
async def test_compute_list(controller_api):
params = {
"compute_id": "my_compute_id",
@ -112,13 +113,14 @@ def test_compute_list(http_controller, controller):
"password": "secure",
"name": "My super server"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
assert response.route == "/computes"
assert response.json["user"] == "julien"
assert "password" not in response.json
response = http_controller.get("/computes", example=True)
response = await controller_api.get("/computes")
for compute in response.json:
if compute['compute_id'] != 'local':
assert compute == {
@ -139,7 +141,7 @@ def test_compute_list(http_controller, controller):
}
def test_compute_delete(http_controller, controller):
async def test_compute_delete(controller_api):
params = {
"compute_id": "my_compute_id",
@ -149,20 +151,20 @@ def test_compute_delete(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
response = http_controller.get("/computes")
response = await controller_api.get("/computes")
assert len(response.json) == 1
response = http_controller.delete("/computes/my_compute_id", example=True)
response = await controller_api.delete("/computes/my_compute_id")
assert response.status == 204
response = http_controller.get("/computes")
response = await controller_api.get("/computes")
assert len(response.json) == 0
def test_compute_list_images(http_controller, controller):
async def test_compute_list_images(controller_api):
params = {
"compute_id": "my_compute",
@ -172,16 +174,16 @@ def test_compute_list_images(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
with asyncio_patch("gns3server.controller.compute.Compute.images", return_value=[{"filename": "linux.qcow2"}, {"filename": "asav.qcow2"}]) as mock:
response = http_controller.get("/computes/my_compute/qemu/images", example=True)
response = await controller_api.get("/computes/my_compute/qemu/images")
assert response.json == [{"filename": "linux.qcow2"}, {"filename": "asav.qcow2"}]
mock.assert_called_with("qemu")
def test_compute_list_vms(http_controller, controller):
async def test_compute_list_vms(controller_api):
params = {
"compute_id": "my_compute",
@ -191,16 +193,16 @@ def test_compute_list_vms(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
with asyncio_patch("gns3server.controller.compute.Compute.forward", return_value=[]) as mock:
response = http_controller.get("/computes/my_compute/virtualbox/vms", example=True)
response = await controller_api.get("/computes/my_compute/virtualbox/vms")
assert response.json == []
mock.assert_called_with("GET", "virtualbox", "vms")
def test_compute_create_img(http_controller, controller):
async def test_compute_create_img(controller_api):
params = {
"compute_id": "my_compute",
@ -210,16 +212,18 @@ def test_compute_create_img(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
params = {"path": "/test"}
with asyncio_patch("gns3server.controller.compute.Compute.forward", return_value=[]) as mock:
response = http_controller.post("/computes/my_compute/qemu/img", params, example=True)
response = await controller_api.post("/computes/my_compute/qemu/img", params)
assert response.json == []
mock.assert_called_with("POST", "qemu", "img", data=unittest.mock.ANY)
def test_compute_autoidlepc(http_controller, controller):
async def test_compute_autoidlepc(controller_api):
params = {
"compute_id": "my_compute_id",
@ -229,20 +233,23 @@ def test_compute_autoidlepc(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params, example=False)
await controller_api.post("/computes", params)
params = {
"platform": "c7200",
"image": "test.bin",
"ram": 512
}
with asyncio_patch("gns3server.controller.Controller.autoidlepc", return_value={"idlepc": "0x606de20c"}) as mock:
response = http_controller.post("/computes/my_compute_id/auto_idlepc", params, example=True)
response = await controller_api.post("/computes/my_compute_id/auto_idlepc", params)
assert mock.called
assert response.status == 200
def test_compute_endpoint(http_controller, controller):
async def test_compute_endpoint(controller_api):
params = {
"compute_id": "my_compute",
"protocol": "http",
@ -251,10 +258,10 @@ def test_compute_endpoint(http_controller, controller):
"user": "julien",
"password": "secure"
}
response = http_controller.post("/computes", params)
response = await controller_api.post("/computes", params)
assert response.status == 201
response = http_controller.get("/computes/endpoint/my_compute/virtualbox/images")
response = await controller_api.get("/computes/endpoint/my_compute/virtualbox/images")
assert response.status == 200
assert response.json['endpoint'] == 'http://localhost:84/v2/compute/virtualbox/images'