diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | docs/com/pres/framework/index.html (renamed from docs/com/pres/framework/framework.html) | 0 | ||||
| -rwxr-xr-x | functest/ci/run_tests.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/features/barometer.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/mano/orchestra.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_test_runner.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_base.py | 4 | ||||
| -rwxr-xr-x | functest/opnfv_tests/openstack/vping/vping_ssh.py | 2 | ||||
| -rwxr-xr-x | functest/opnfv_tests/openstack/vping/vping_userdata.py | 2 | ||||
| -rwxr-xr-x | functest/opnfv_tests/sdn/onos/sfc/sfc.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/clearwater.py | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py | 2 | ||||
| -rw-r--r-- | tox.ini | 5 |
16 files changed, 18 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore index 341cf2811..f6e406203 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ nosetests.xml functest.egg-info *venv .tox +*.out diff --git a/docs/com/pres/framework/framework.html b/docs/com/pres/framework/index.html index 950c2bebf..950c2bebf 100644 --- a/docs/com/pres/framework/framework.html +++ b/docs/com/pres/framework/index.html diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index 9e64196ed..af45c3211 100755 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # Author: Jose Lausuch (jose.lausuch@ericsson.com) # diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py index cbfe7d9a8..e210f333c 100644 --- a/functest/opnfv_tests/features/barometer.py +++ b/functest/opnfv_tests/features/barometer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/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. diff --git a/functest/opnfv_tests/mano/orchestra.py b/functest/opnfv_tests/mano/orchestra.py index dea26efc3..955f82ce1 100644 --- a/functest/opnfv_tests/mano/orchestra.py +++ b/functest/opnfv_tests/mano/orchestra.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/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. diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 97e2444a7..2ae6817d0 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py index 2b98a202f..5e39946d4 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py @@ -33,7 +33,7 @@ class SnapsTestRunner(unit.Suite): self.use_keystone = CONST.__getattribute__('snaps_use_keystone') scenario = functest_utils.get_scenario() - self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY + self.flavor_metadata = None if 'ovs' in scenario or 'fdio' in scenario: self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 556a41d4c..15365ccff 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 99425af54..cb8e9b4a5 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 099f26b7a..856d5f220 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials @@ -79,7 +79,7 @@ class VPingBase(testcase.OSGCTestCase): scenario = functest_utils.get_scenario() - self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY + self.flavor_metadata = None if 'ovs' in scenario or 'fdio' in scenario: self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py index 0ad77402e..6ac0d6764 100755 --- a/functest/opnfv_tests/openstack/vping/vping_ssh.py +++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py index 8ea9be84b..b69b39554 100755 --- a/functest/opnfv_tests/openstack/vping/vping_userdata.py +++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials diff --git a/functest/opnfv_tests/sdn/onos/sfc/sfc.py b/functest/opnfv_tests/sdn/onos/sfc/sfc.py index 0155d24d7..a2dd7e9a0 100755 --- a/functest/opnfv_tests/sdn/onos/sfc/sfc.py +++ b/functest/opnfv_tests/sdn/onos/sfc/sfc.py @@ -1,4 +1,4 @@ -# !/usr/bin/python +#!/usr/bin/env python # # Copyright (c) CREATED5 All rights reserved # This program and the accompanying materials diff --git a/functest/opnfv_tests/vnf/ims/clearwater.py b/functest/opnfv_tests/vnf/ims/clearwater.py index 32c6dc5c9..33ed352dc 100644 --- a/functest/opnfv_tests/vnf/ims/clearwater.py +++ b/functest/opnfv_tests/vnf/ims/clearwater.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # coding: utf8 ####################################################################### # diff --git a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py index 4ceeb25f8..0cdfcb3f1 100644 --- a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py +++ b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # coding: utf8 ####################################################################### # @@ -29,8 +29,9 @@ basepython = python2.7 deps = {[testenv]deps} whitelist_externals = bash -commands = bash -c \ - "pylint --persistent=n functest | sed -ne '/Raw metrics/,//p'" +commands = bash -c "\ + pylint -f parseable --disable=locally-disabled functest | \ + tee pylint.out | sed -ne '/Raw metrics/,//p'" [testenv:py35] dirs = |