From 9bd1ee2d3893c1450b3650ead9e71b5e01d0883f Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 28 Mar 2023 13:45:28 +0200 Subject: [PATCH] Fix black and cover errors Change-Id: I5525e17a4536686091967ceb3ac2900bce47d9e2 Signed-off-by: garciadeblas --- osm_pla/test/test_nsPlacementDataFactory.py | 4 ++-- osm_pla/test/test_server.py | 3 ++- tox.ini | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/osm_pla/test/test_nsPlacementDataFactory.py b/osm_pla/test/test_nsPlacementDataFactory.py index dbb8572..b7075c3 100644 --- a/osm_pla/test/test_nsPlacementDataFactory.py +++ b/osm_pla/test/test_nsPlacementDataFactory.py @@ -319,7 +319,8 @@ class TestNsPlacementDataFactory(TestCase): def _adjust_path(self, file): """In case we are not running from test directory, - then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly""" + then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly + """ path_component = "/osm_pla/test/" real_path = os.path.realpath(file) if path_component not in real_path: @@ -747,7 +748,6 @@ class TestNsPlacementDataFactory(TestCase): ) def test__produce_vld_desc_w_instantiate_override(self): - vld_desc_expected = [ {"cp_refs": ["one", "two"], "latency": 150, "jitter": 30}, {"cp_refs": ["two", "three"], "latency": 90, "jitter": 30}, diff --git a/osm_pla/test/test_server.py b/osm_pla/test/test_server.py index 3ba2979..127b4d1 100644 --- a/osm_pla/test/test_server.py +++ b/osm_pla/test/test_server.py @@ -487,7 +487,8 @@ class TestServer(TestCase): def _adjust_path(self, file): """In case we are not running from test directory, - then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly""" + then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly + """ path_component = "/osm_pla/test/" real_path = os.path.realpath(file) if path_component not in real_path: diff --git a/tox.ini b/tox.ini index 9f416bc..4b93d38 100644 --- a/tox.ini +++ b/tox.ini @@ -49,7 +49,7 @@ commands = coverage report --omit='*tests*' coverage html -d ./cover --omit='*tests*' coverage xml -o coverage.xml --omit=*tests* -whitelist_externals = sh +allowlist_externals = sh ####################################################################################### @@ -84,7 +84,7 @@ commands = [testenv:pip-compile] deps = pip-tools==6.6.2 skip_install = true -whitelist_externals = bash +allowlist_externals = bash [ commands = - bash -c "for file in requirements*.in ; do \ @@ -108,7 +108,7 @@ commands = python3 setup.py --command-packages=stdeb.command sdist_dsc sh -c 'cd deb_dist/osm-pla*/ && dpkg-buildpackage -rfakeroot -uc -us' sh -c 'rm osm_pla/requirements.txt' -whitelist_externals = sh +allowlist_externals = sh ####################################################################################### [flake8] -- 2.17.1