aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.sh4
-rw-r--r--functest/opnfv_tests/openstack/refstack_client/refstack_client.py6
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py2
-rw-r--r--functest/tests/unit/vnf/router/test_cloudify_vrouter.py20
4 files changed, 18 insertions, 14 deletions
diff --git a/build.sh b/build.sh
index 1f57dcaf..51752a8f 100644
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
for dir in ${amd64_dirs}; do
- (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:amd64-latest" .)
+ (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:amd64-latest" .)
docker push "${repo}/functest-${dir##**/}:amd64-latest"
done
find . -name Dockerfile -exec git checkout {} +
@@ -25,7 +25,7 @@ find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} +
find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
for dir in ${arm64_dirs}; do
- (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:arm64-latest" .)
+ (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:arm64-latest" .)
docker push "${repo}/functest-${dir##**/}:arm64-latest"
done
find . -name Dockerfile -exec git checkout {} +
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 42befe22..fe32da66 100644
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -126,13 +126,13 @@ class RefstackClient(testcase.TestCase):
num_failures = match[1]
LOGGER.info("".join(match))
success_testcases = []
- for match in re.findall(r"\{0\} (.*?)[. ]*ok", output):
+ for match in re.findall(r"\{0\} (.*?) \.{3} ok", output):
success_testcases.append(match)
failed_testcases = []
- for match in re.findall(r"\{0\} (.*?)[. ]*FAILED", output):
+ for match in re.findall(r"\{0\} (.*?) \.{3} FAILED", output):
failed_testcases.append(match)
skipped_testcases = []
- for match in re.findall(r"\{0\} (.*?)[. ]*SKIPPED:", output):
+ for match in re.findall(r"\{0\} (.*?) \.{3} SKIPPED:", output):
skipped_testcases.append(match)
num_executed = int(num_tests) - int(num_skipped)
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
index b83967d3..fb20e4fd 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
# Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
#
# This program and the accompanying materials
diff --git a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
index 4f256234..4d8e9405 100644
--- a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
+++ b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
@@ -18,7 +18,11 @@ from functest.opnfv_tests.vnf.router import cloudify_vrouter
class CloudifyVrouterTesting(unittest.TestCase):
- def setUp(self):
+ @mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.Utilvnf')
+ @mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.vrouter_base'
+ '.Utilvnf')
+ @mock.patch('os.makedirs')
+ def setUp(self, *args):
self.tenant = 'cloudify_vrouter'
self.creds = {'username': 'user',
@@ -41,14 +45,12 @@ class CloudifyVrouterTesting(unittest.TestCase):
'ram_min': 2048}}}}
with mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.'
- 'os.makedirs'), \
- mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.'
- 'get_config', return_value={
- 'tenant_images': 'foo',
- 'orchestrator': self.orchestrator,
- 'vnf': self.vnf,
- 'vnf_test_suite': '',
- 'version': 'whatever'}):
+ 'get_config', return_value={
+ 'tenant_images': 'foo',
+ 'orchestrator': self.orchestrator,
+ 'vnf': self.vnf,
+ 'vnf_test_suite': '',
+ 'version': 'whatever'}):
self.router_vnf = cloudify_vrouter.CloudifyVrouter()