From: garciadeblas Date: Tue, 28 Mar 2023 22:17:17 +0000 (+0200) Subject: Fix black and cover errors X-Git-Tag: v13.0.2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2daf1da9263d617fed5a8d2995d40fe563f25db3;p=osm%2FPLA.git Fix black and cover errors Change-Id: Ic6b5d4babf5d7da3f1e78b0ed1abd5110bc9a904 Signed-off-by: garciadeblas --- 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/requirements-dev.in b/requirements-dev.in index 43d075c..8010545 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -13,5 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common +git+https://osm.etsi.org/gerrit/osm/common.git@v13.0#egg=osm-common -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v13.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index 3d56590..1c89a18 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -22,7 +22,7 @@ kafka-python==2.0.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v13.0 # aiokafka -osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master +osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@v13.0 # via -r requirements-dev.in pycrypto==2.6.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v13.0 diff --git a/tox.ini b/tox.ini index cd097e1..8d2401c 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]