aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2017-05-22 13:09:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-22 13:09:00 +0000
commit7e6191e9d4f3734efb1aacf2ded8c20b16aeb4af (patch)
tree77490051cde3450a57e17366fc2d8b2f3a7a05de
parent84bd5c62dd21300e96979217dee1e31d75c439ca (diff)
parent8bf944f3c3b2160b2d2d47647fb6c97f9e133a88 (diff)
Merge "Add baro_tests as requirements"
-rw-r--r--docker/Dockerfile4
-rw-r--r--functest/tests/unit/features/test_barometer.py5
-rw-r--r--requirements.txt1
3 files changed, 3 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4a570b5d..ef5967f7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -89,7 +89,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPO
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds ${REPOS_DIR}/fds
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/barometer ${REPOS_DIR}/barometer
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/snaps ${REPOS_DIR}/snaps
RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
@@ -115,9 +114,6 @@ RUN cd ${FUNCTEST_REPO_DIR} \
&& pip install -r requirements.txt \
&& pip install -e .
-RUN cd ${REPOS_DIR}/barometer \
- && pip install .
-
RUN pip install ${REPOS_DIR}/opera
RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
diff --git a/functest/tests/unit/features/test_barometer.py b/functest/tests/unit/features/test_barometer.py
index c6512615..8c2585d9 100644
--- a/functest/tests/unit/features/test_barometer.py
+++ b/functest/tests/unit/features/test_barometer.py
@@ -16,9 +16,8 @@ import unittest
import mock
from functest.core import testcase
-sys.modules['baro_tests'] = mock.Mock() # noqa
-# pylint: disable=wrong-import-position
-from functest.opnfv_tests.features import barometer
+with mock.patch('functest.utils.functest_utils.get_parameter_from_yaml'):
+ from functest.opnfv_tests.features import barometer
class BarometerTesting(unittest.TestCase):
diff --git a/requirements.txt b/requirements.txt
index 7b8af657..425d4a6c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,3 +38,4 @@ iniparse==0.4
PrettyTable>=0.7.1,<0.8 # BSD
six>=1.9.0 # MIT
git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
+git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests