From ad3ec6ae195e9cda3af316d5cc47de0e948abe4c Mon Sep 17 00:00:00 2001 From: Jo¶rgen Karlsson Date: Wed, 13 Jan 2016 16:19:58 +0100 Subject: Fix flake8 errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I14f21092f5e97abf0629a92a27062846a6d3130b JIRA:- Signed-off-by: Jo¶rgen Karlsson (cherry picked from commit 791323df72d8bf4f4f4c32a1e7273721f2adc349) --- yardstick/vTC/apexlake/experimental_framework/heat_manager.py | 5 ++--- yardstick/vTC/apexlake/tests/benchmarking_unit_test.py | 5 ++--- yardstick/vTC/apexlake/tests/common_test.py | 4 ++-- yardstick/vTC/apexlake/tests/conf_file_sections_test.py | 5 ++--- yardstick/vTC/apexlake/tests/deployment_unit_test.py | 5 ++--- yardstick/vTC/apexlake/tests/generates_template_test.py | 5 ++--- yardstick/vTC/apexlake/tests/heat_manager_test.py | 5 ++--- .../vTC/apexlake/tests/multi_tenancy_throughput_benchmark_test.py | 5 ++--- yardstick/vTC/apexlake/tests/tree_node_test.py | 5 ++--- 9 files changed, 18 insertions(+), 26 deletions(-) (limited to 'yardstick/vTC') diff --git a/yardstick/vTC/apexlake/experimental_framework/heat_manager.py b/yardstick/vTC/apexlake/experimental_framework/heat_manager.py index 607fa77f3..28c069f6c 100644 --- a/yardstick/vTC/apexlake/experimental_framework/heat_manager.py +++ b/yardstick/vTC/apexlake/experimental_framework/heat_manager.py @@ -12,15 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'vmriccox' - - from keystoneclient.v2_0 import client as keystoneClient from heatclient import client as heatClient from heatclient.common import template_utils import experimental_framework.common as common +__author__ = 'vmriccox' + class HeatManager: diff --git a/yardstick/vTC/apexlake/tests/benchmarking_unit_test.py b/yardstick/vTC/apexlake/tests/benchmarking_unit_test.py index ccf64066a..652327aab 100644 --- a/yardstick/vTC/apexlake/tests/benchmarking_unit_test.py +++ b/yardstick/vTC/apexlake/tests/benchmarking_unit_test.py @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'vmriccox' - - import unittest import mock from experimental_framework.benchmarking_unit import BenchmarkingUnit @@ -24,6 +21,8 @@ import experimental_framework.common as common from experimental_framework.benchmarks.rfc2544_throughput_benchmark import \ RFC2544ThroughputBenchmark +__author__ = 'vmriccox' + # class DummyDataManager(DataManager): # diff --git a/yardstick/vTC/apexlake/tests/common_test.py b/yardstick/vTC/apexlake/tests/common_test.py index 293754b16..19b2a0ea2 100644 --- a/yardstick/vTC/apexlake/tests/common_test.py +++ b/yardstick/vTC/apexlake/tests/common_test.py @@ -1,5 +1,3 @@ -__author__ = 'vmricco' - import unittest import mock import os @@ -8,6 +6,8 @@ import ConfigParser import experimental_framework.common as common import experimental_framework.constants.conf_file_sections as cf +__author__ = 'vmricco' + def reset_common(): common.LOG = None diff --git a/yardstick/vTC/apexlake/tests/conf_file_sections_test.py b/yardstick/vTC/apexlake/tests/conf_file_sections_test.py index d2157fcce..3266ce6b7 100644 --- a/yardstick/vTC/apexlake/tests/conf_file_sections_test.py +++ b/yardstick/vTC/apexlake/tests/conf_file_sections_test.py @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'vmriccox' - - import unittest from experimental_framework.constants import conf_file_sections as cfs +__author__ = 'vmriccox' + class TestConfFileSection(unittest.TestCase): diff --git a/yardstick/vTC/apexlake/tests/deployment_unit_test.py b/yardstick/vTC/apexlake/tests/deployment_unit_test.py index 46b32837b..81171670c 100644 --- a/yardstick/vTC/apexlake/tests/deployment_unit_test.py +++ b/yardstick/vTC/apexlake/tests/deployment_unit_test.py @@ -12,13 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'vmriccox' - - import unittest import mock import experimental_framework.deployment_unit as mut +__author__ = 'vmriccox' + class DummyHeatManager: diff --git a/yardstick/vTC/apexlake/tests/generates_template_test.py b/yardstick/vTC/apexlake/tests/generates_template_test.py index f4525a23d..dad3177d6 100644 --- a/yardstick/vTC/apexlake/tests/generates_template_test.py +++ b/yardstick/vTC/apexlake/tests/generates_template_test.py @@ -12,15 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'gpetralx' - - import unittest import experimental_framework.heat_template_generation as heat_gen import mock import os import experimental_framework.common as common +__author__ = 'gpetralx' + def reset_common(): common.LOG = None diff --git a/yardstick/vTC/apexlake/tests/heat_manager_test.py b/yardstick/vTC/apexlake/tests/heat_manager_test.py index a2798a737..f1d3d0028 100644 --- a/yardstick/vTC/apexlake/tests/heat_manager_test.py +++ b/yardstick/vTC/apexlake/tests/heat_manager_test.py @@ -12,13 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'gpetralx' - - import unittest from experimental_framework import heat_manager import mock +__author__ = 'gpetralx' + def get_mock_heat(version, *args, **kwargs): return MockHeat() diff --git a/yardstick/vTC/apexlake/tests/multi_tenancy_throughput_benchmark_test.py b/yardstick/vTC/apexlake/tests/multi_tenancy_throughput_benchmark_test.py index babf04ab1..6544fea43 100644 --- a/yardstick/vTC/apexlake/tests/multi_tenancy_throughput_benchmark_test.py +++ b/yardstick/vTC/apexlake/tests/multi_tenancy_throughput_benchmark_test.py @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'gpetralx' - - import unittest import mock import os @@ -22,6 +19,8 @@ import experimental_framework.common as common from experimental_framework.benchmarks \ import multi_tenancy_throughput_benchmark as bench +__author__ = 'gpetralx' + class MockDeploymentUnit(object): def deploy_heat_template(self, temp_file, stack_name, heat_param): diff --git a/yardstick/vTC/apexlake/tests/tree_node_test.py b/yardstick/vTC/apexlake/tests/tree_node_test.py index 8b302c912..e51343f0e 100644 --- a/yardstick/vTC/apexlake/tests/tree_node_test.py +++ b/yardstick/vTC/apexlake/tests/tree_node_test.py @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'gpetralx' - - import unittest import experimental_framework.heat_template_generation as heat_gen +__author__ = 'gpetralx' + class TestTreeNode(unittest.TestCase): def setUp(self): -- cgit 1.2.3-korg