From 739a151179af2fd69c8bca107f917811a4a3f6b4 Mon Sep 17 00:00:00 2001 From: Jose Lausuch Date: Tue, 13 Jun 2017 11:26:52 +0800 Subject: Change barometer module to load MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As [1] is merged, the way to call the barometer test case is different as it is hosted in Barometer repo instead of Functest. The former files are also simply removed too. baro-tests is no longer a requirement. It is installed as any third party project. [1] https://gerrit.opnfv.org/gerrit/#/c/35927/ Co-Authored-By: Cédric Ollivier Change-Id: Iea56b48fa781600eb3a6ac74662ea8a29f556f99 Signed-off-by: Jose Lausuch Signed-off-by: Cédric Ollivier --- docker/Dockerfile | 5 +-- docker/Dockerfile.aarch64 | 5 +-- docker/thirdparty-requirements.txt | 1 + functest/ci/testcases.yaml | 2 +- functest/opnfv_tests/features/__init__.py | 0 functest/opnfv_tests/features/barometer.py | 24 ------------- functest/tests/unit/features/__init__.py | 0 functest/tests/unit/features/test_barometer.py | 48 -------------------------- requirements.txt | 1 - tox.ini | 1 - 10 files changed, 8 insertions(+), 79 deletions(-) create mode 100644 docker/thirdparty-requirements.txt delete mode 100644 functest/opnfv_tests/features/__init__.py delete mode 100644 functest/opnfv_tests/features/barometer.py delete mode 100644 functest/tests/unit/features/__init__.py delete mode 100644 functest/tests/unit/features/test_barometer.py diff --git a/docker/Dockerfile b/docker/Dockerfile index d18c6c97..80864ed9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -79,11 +79,12 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \ RUN git config --global http.sslVerify false +COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN pip install \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ - git+https://gerrit.opnfv.org/gerrit/barometer@$BRANCH#egg=baro_tests \ - git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps + git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ + -r thirdparty-requirements.txt # Hook required by hardcoded paths in Functest RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/functest diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index eea475a8..4fbfeac4 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -78,11 +78,12 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \ RUN git config --global http.sslVerify false +COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN pip install \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ - git+https://gerrit.opnfv.org/gerrit/barometer@$BRANCH#egg=baro_tests \ - git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps + git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ + -r thirdparty-requirements.txt # Hook required by hardcoded paths in Functest RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/functest diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt new file mode 100644 index 00000000..51d21f2d --- /dev/null +++ b/docker/thirdparty-requirements.txt @@ -0,0 +1 @@ +git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 7d518324..c30292bc 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -447,7 +447,7 @@ tiers: installer: 'fuel' scenario: 'kvm_ovs_dpdk_bar' run: - module: 'functest.opnfv_tests.features.barometer' + module: 'baro_tests.barometer' class: 'BarometerCollectd' - diff --git a/functest/opnfv_tests/features/__init__.py b/functest/opnfv_tests/features/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py deleted file mode 100644 index e210f333..00000000 --- a/functest/opnfv_tests/features/barometer.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 - -import logging - -from baro_tests import collectd - -import functest.core.feature as base - - -class BarometerCollectd(base.Feature): - ''' - Class for executing barometercollectd testcase. - ''' - - __logger = logging.getLogger(__name__) - - def execute(self): - return collectd.main(self.__logger) diff --git a/functest/tests/unit/features/__init__.py b/functest/tests/unit/features/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/functest/tests/unit/features/test_barometer.py b/functest/tests/unit/features/test_barometer.py deleted file mode 100644 index 8c2585d9..00000000 --- a/functest/tests/unit/features/test_barometer.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2017 Orange and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 - -# pylint: disable=missing-docstring - -import logging -import sys -import unittest - -import mock - -from functest.core import testcase -with mock.patch('functest.utils.functest_utils.get_parameter_from_yaml'): - from functest.opnfv_tests.features import barometer - - -class BarometerTesting(unittest.TestCase): - - _case_name = "barometercollectd" - _project_name = "barometer" - - def setUp(self): - self.barometer = barometer.BarometerCollectd( - case_name=self._case_name, project_name=self._project_name) - - def test_init(self): - self.assertEqual(self.barometer.project_name, self._project_name) - self.assertEqual(self.barometer.case_name, self._case_name) - - def test_run_ko(self): - sys.modules['baro_tests'].collectd.main = mock.Mock(return_value=1) - self.assertEqual(self.barometer.run(), - testcase.TestCase.EX_RUN_ERROR) - - def test_run(self): - sys.modules['baro_tests'].collectd.main = mock.Mock(return_value=0) - self.assertEqual(self.barometer.run(), testcase.TestCase.EX_OK) - - -if __name__ == "__main__": - logging.disable(logging.CRITICAL) - unittest.main(verbosity=2) diff --git a/requirements.txt b/requirements.txt index 10d83e18..6384f967 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,5 +26,4 @@ iniparse==0.4 PrettyTable<0.8,>=0.7.1 # BSD six>=1.9.0 # MIT opnfv -baro-tests snaps diff --git a/tox.ini b/tox.ini index c8d45457..bdc32ea7 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules - git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps commands = nosetests --with-xunit \ --with-coverage \ -- cgit 1.2.3-korg