From be14462cdc8c2463f76fc5b6700cd780dd3de325 Mon Sep 17 00:00:00 2001 From: Juan Jose Nicola Date: Thu, 21 Jan 2021 17:44:30 +0100 Subject: [PATCH] Update header year --- ospd_openvas/__init__.py | 2 +- ospd_openvas/daemon.py | 2 +- ospd_openvas/db.py | 2 +- ospd_openvas/errors.py | 2 +- ospd_openvas/lock.py | 2 +- ospd_openvas/nvticache.py | 2 +- ospd_openvas/openvas.py | 2 +- ospd_openvas/preferencehandler.py | 2 +- ospd_openvas/vthelper.py | 2 +- setup.py | 2 +- tests/dummydaemon.py | 2 +- tests/helper.py | 5 ++--- tests/test_daemon.py | 2 +- tests/test_db.py | 16 +++++++++++++--- tests/test_lock.py | 2 +- tests/test_nvti_cache.py | 20 +++++++++++++------- tests/test_openvas.py | 2 +- tests/test_preferencehandler.py | 2 +- tests/test_vthelper.py | 2 +- 19 files changed, 44 insertions(+), 29 deletions(-) diff --git a/ospd_openvas/__init__.py b/ospd_openvas/__init__.py index decd8672..ed6324cd 100644 --- a/ospd_openvas/__init__.py +++ b/ospd_openvas/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/daemon.py b/ospd_openvas/daemon.py index f042456c..7cc6a8f4 100644 --- a/ospd_openvas/daemon.py +++ b/ospd_openvas/daemon.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/db.py b/ospd_openvas/db.py index 92e713db..b2290480 100644 --- a/ospd_openvas/db.py +++ b/ospd_openvas/db.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/errors.py b/ospd_openvas/errors.py index b574f46f..d2628103 100644 --- a/ospd_openvas/errors.py +++ b/ospd_openvas/errors.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/lock.py b/ospd_openvas/lock.py index ed1c0b9f..642ea793 100644 --- a/ospd_openvas/lock.py +++ b/ospd_openvas/lock.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/nvticache.py b/ospd_openvas/nvticache.py index 76850726..65cf7a08 100644 --- a/ospd_openvas/nvticache.py +++ b/ospd_openvas/nvticache.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/openvas.py b/ospd_openvas/openvas.py index daa05ba2..0979e31c 100644 --- a/ospd_openvas/openvas.py +++ b/ospd_openvas/openvas.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/preferencehandler.py b/ospd_openvas/preferencehandler.py index 11328717..ac13b6b3 100644 --- a/ospd_openvas/preferencehandler.py +++ b/ospd_openvas/preferencehandler.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/ospd_openvas/vthelper.py b/ospd_openvas/vthelper.py index b752dd4d..fd2c1b64 100644 --- a/ospd_openvas/vthelper.py +++ b/ospd_openvas/vthelper.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/setup.py b/setup.py index f3ec3622..8e22de46 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/tests/dummydaemon.py b/tests/dummydaemon.py index fb72e204..79b8f22f 100644 --- a/tests/dummydaemon.py +++ b/tests/dummydaemon.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/tests/helper.py b/tests/helper.py index 2dd398ad..c5dbcbe5 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # @@ -34,8 +34,7 @@ def assert_called_once(mock: Mock): def assert_called(mock: Mock): - """assert that the mock was called at least once - """ + """assert that the mock was called at least once""" if mock.call_count == 0: msg = "Expected '%s' to have been called." % (mock._mock_name or 'mock') raise AssertionError(msg) diff --git a/tests/test_daemon.py b/tests/test_daemon.py index dbf68fb3..781662ce 100644 --- a/tests/test_daemon.py +++ b/tests/test_daemon.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/tests/test_db.py b/tests/test_db.py index 5b5b75f0..86e17487 100644 --- a/tests/test_db.py +++ b/tests/test_db.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # @@ -319,7 +319,12 @@ def test_get_result(self, mock_openvas_db): ret = self.db.get_result() - self.assertEqual(ret, ['some result',]) + self.assertEqual( + ret, + [ + 'some result', + ], + ) mock_openvas_db.pop_list_items.assert_called_with( self.ctx, 'internal/results' ) @@ -432,7 +437,12 @@ def test_get_result(self, mock_openvas_db): ret = self.db.get_result() - self.assertEqual(ret, ['some results',]) + self.assertEqual( + ret, + [ + 'some results', + ], + ) mock_openvas_db.pop_list_items.assert_called_with( self.ctx, 'internal/results' ) diff --git a/tests/test_lock.py b/tests/test_lock.py index 6c0275d0..84d94efb 100644 --- a/tests/test_lock.py +++ b/tests/test_lock.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/tests/test_nvti_cache.py b/tests/test_nvti_cache.py index c43928ae..01e7fe74 100644 --- a/tests/test_nvti_cache.py +++ b/tests/test_nvti_cache.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # @@ -86,8 +86,10 @@ def test_parse_metadata_tag_missing_value(self, MockOpenvasDB): logging.Logger.error = Mock() tags = 'tag1' - ret = NVTICache._parse_metadata_tags( # pylint: disable=protected-access - tags, '1.2.3' + ret = ( + NVTICache._parse_metadata_tags( # pylint: disable=protected-access + tags, '1.2.3' + ) ) self.assertEqual(ret, {}) @@ -95,16 +97,20 @@ def test_parse_metadata_tag_missing_value(self, MockOpenvasDB): def test_parse_metadata_tag(self, MockOpenvasDB): tags = 'tag1=value1' - ret = NVTICache._parse_metadata_tags( # pylint: disable=protected-access - tags, '1.2.3' + ret = ( + NVTICache._parse_metadata_tags( # pylint: disable=protected-access + tags, '1.2.3' + ) ) self.assertEqual(ret, {'tag1': 'value1'}) def test_parse_metadata_tags(self, MockOpenvasDB): tags = 'tag1=value1|foo=bar' - ret = NVTICache._parse_metadata_tags( # pylint: disable=protected-access - tags, '1.2.3' + ret = ( + NVTICache._parse_metadata_tags( # pylint: disable=protected-access + tags, '1.2.3' + ) ) self.assertEqual(ret, {'tag1': 'value1', 'foo': 'bar'}) diff --git a/tests/test_openvas.py b/tests/test_openvas.py index 60483210..7ddfadbe 100644 --- a/tests/test_openvas.py +++ b/tests/test_openvas.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/tests/test_preferencehandler.py b/tests/test_preferencehandler.py index 7ad96040..cffce8ed 100644 --- a/tests/test_preferencehandler.py +++ b/tests/test_preferencehandler.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later # diff --git a/tests/test_vthelper.py b/tests/test_vthelper.py index e0bdef87..3b412375 100644 --- a/tests/test_vthelper.py +++ b/tests/test_vthelper.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 Greenbone Networks GmbH +# Copyright (C) 2014-2021 Greenbone Networks GmbH # # SPDX-License-Identifier: AGPL-3.0-or-later #