From bf29e0319e5dc41f11e1bbe75d98856f7d8d3fa9 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 9 Feb 2015 10:38:34 +0100 Subject: [PATCH] Test logger and PEP8 --- tests/api/test_virtualbox.py | 12 +++++---- tests/web/test_logger.py | 50 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 tests/web/test_logger.py diff --git a/tests/api/test_virtualbox.py b/tests/api/test_virtualbox.py index f1f729d6..c37a56f0 100644 --- a/tests/api/test_virtualbox.py +++ b/tests/api/test_virtualbox.py @@ -18,6 +18,7 @@ import pytest from tests.utils import asyncio_patch + @pytest.yield_fixture(scope="module") def vm(server, project, monkeypatch): @@ -33,6 +34,7 @@ def vm(server, project, monkeypatch): with asyncio_patch("gns3server.modules.virtualbox.VirtualBox.find_vboxmanage", return_value=vboxmanage_path): yield response.json + def test_vbox_create(server, project): with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.create", return_value=True): @@ -92,11 +94,11 @@ def test_vbox_nio_create_udp(server, vm): with asyncio_patch('gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.adapter_add_nio_binding') as mock: response = server.post("/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/0/nio".format(project_id=vm["project_id"], - vm_id=vm["vm_id"]), {"type": "nio_udp", - "lport": 4242, - "rport": 4343, - "rhost": "127.0.0.1"}, - example=True) + vm_id=vm["vm_id"]), {"type": "nio_udp", + "lport": 4242, + "rport": 4343, + "rhost": "127.0.0.1"}, + example=True) assert mock.called args, kwgars = mock.call_args diff --git a/tests/web/test_logger.py b/tests/web/test_logger.py new file mode 100644 index 00000000..5867157d --- /dev/null +++ b/tests/web/test_logger.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2015 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import logging + +from gns3server.web.logger import init_logger + + +def test_init_logger(caplog): + + logger = init_logger(logging.DEBUG) + logger.debug("DEBUG1") + assert "DEBUG1" in caplog.text() + logger.info("INFO1") + assert "INFO1" in caplog.text() + logger.warn("WARN1") + assert "WARN1" in caplog.text() + logger.error("ERROR1") + assert "ERROR1" in caplog.text() + logger.critical("CRITICAL1") + assert "CRITICAL1" in caplog.text() + + +def test_init_logger_quiet(caplog): + + logger = init_logger(logging.DEBUG, quiet=True) + logger.debug("DEBUG1") + assert "DEBUG1" not in caplog.text() + logger.info("INFO1") + assert "INFO1" not in caplog.text() + logger.warn("WARN1") + assert "WARN1" not in caplog.text() + logger.error("ERROR1") + assert "ERROR1" not in caplog.text() + logger.critical("CRITICAL1") + assert "CRITICAL1" not in caplog.text()