From 03b56f88fb9fda5396f117e8721f715d30e34966 Mon Sep 17 00:00:00 2001 From: Vincenzo Riccobene Date: Mon, 18 Jan 2016 15:35:52 +0000 Subject: Fix Apexlake Documentation Change-Id: If9519d1660fe21bc13307ce35711424c6e2b8176 Signed-off-by: Vincenzo Riccobene (cherry picked from commit 19caefaa3505a67bea77cf082168f29cbcf41ba9) --- yardstick/vTC/apexlake/MANIFEST.in | 2 +- .../benchmarks/rfc2544_throughput_benchmark.py | 1 - yardstick/vTC/apexlake/setup.py | 14 ++++++++++++++ yardstick/vTC/apexlake/tests/common_test.py | 18 +++++++++++++++++- 4 files changed, 32 insertions(+), 3 deletions(-) (limited to 'yardstick/vTC/apexlake') diff --git a/yardstick/vTC/apexlake/MANIFEST.in b/yardstick/vTC/apexlake/MANIFEST.in index 57649e597..f784569e9 100644 --- a/yardstick/vTC/apexlake/MANIFEST.in +++ b/yardstick/vTC/apexlake/MANIFEST.in @@ -4,4 +4,4 @@ recursive-include heat_templates * recursive-include packet_generators * recursive-include etc *.cfg *.json include *.py -include README.md +include README.rst diff --git a/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py b/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py index e026fa377..9db62e639 100644 --- a/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py +++ b/yardstick/vTC/apexlake/experimental_framework/benchmarks/rfc2544_throughput_benchmark.py @@ -1,4 +1,3 @@ - # Copyright (c) 2015 Intel Research and Development Ireland Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/yardstick/vTC/apexlake/setup.py b/yardstick/vTC/apexlake/setup.py index dcd004698..aac363ea4 100644 --- a/yardstick/vTC/apexlake/setup.py +++ b/yardstick/vTC/apexlake/setup.py @@ -1,3 +1,17 @@ +# Copyright (c) 2015 Intel Research and Development Ireland Ltd. +# +# 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 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + """ Experimental Framework """ diff --git a/yardstick/vTC/apexlake/tests/common_test.py b/yardstick/vTC/apexlake/tests/common_test.py index 19b2a0ea2..486ed6d25 100644 --- a/yardstick/vTC/apexlake/tests/common_test.py +++ b/yardstick/vTC/apexlake/tests/common_test.py @@ -1,3 +1,17 @@ +# Copyright (c) 2015 Intel Research and Development Ireland Ltd. +# +# 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 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + import unittest import mock import os @@ -124,13 +138,15 @@ class TestCommonInit(unittest.TestCase): expected = self.dir.split('experimental_framework/')[0] self.assertEqual(common.BASE_DIR, expected) + @mock.patch('experimental_framework.common.InputValidation') @mock.patch('os.path.exists') @mock.patch('os.makedirs') @mock.patch('experimental_framework.common.LOG') def test_init_general_vars_for_success(self, mock_log, mock_makedirs, - mock_path_exists): + mock_path_exists, mock_val_file): common.BASE_DIR = "{}/".format(os.getcwd()) mock_path_exists.return_value = False + mock_val_file.return_value = True common.init_general_vars() self.assertEqual(common.TEMPLATE_FILE_EXTENSION, '.yaml') self.assertEqual(common.TEMPLATE_DIR, '/tmp/apexlake/heat_templates/') -- cgit 1.2.3-korg