openstack
/
murano
Code Issues Proposed changes

Test hot package files with sets instead of lists 

Before test_hot_package file used lists for testing which files were
generated. This could potentially lead to false negatives, as os.walk
returns file names in arbitrary order.
This commit replaces lists with sets to mitigate the problem.
Renames _build_hot_resources_dict as it does not return a dict.

Change-Id: I348d5c5bbf0db0d4d734d07a5449e6f3d171fcbf
Closes-Bug: #1494722
This commit is contained in:
Kirill Zaitsev 2015-10-01 13:46:13 +03:00
parent caf9e9eba8
commit 092cbb2af4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
murano/packages/hot_package.py
View File

@ -185,10 +185,10 @@ class HotPackage(package_base.PackageBase):
RESOURCES_DIR_NAME,
HOT_FILES_DIR_NAME)
return HotPackage._build_hot_resources_dict(hot_files_path)
return HotPackage._build_hot_resources(hot_files_path)
@staticmethod
def _build_hot_resources_dict(basedir):
def _build_hot_resources(basedir):
result = []
if os.path.isdir(basedir):
for root, _, files in os.walk(os.path.abspath(basedir)):

8
murano/tests/unit/packages/hot_package/test_hot_package.py
View File

@ -29,14 +29,14 @@ class TestHotPackage(test_base.MuranoTestCase):
files = murano.packages.hot_package.HotPackage._translate_files(
package_dir)
expected_result = [
expected_result = {
"testHeatFile",
"middle_file/testHeatFile",
"middle_file/inner_file/testHeatFile",
"middle_file/inner_file2/testHeatFile"
]
}
msg = "hot files were not generated correctly"
self.assertEqual(expected_result, files, msg)
self.assertSetEqual(expected_result, set(files), msg)
def test_heat_files_generated_empty(self):
package_dir = os.path.abspath(
@ -47,5 +47,5 @@ class TestHotPackage(test_base.MuranoTestCase):
files = murano.packages.hot_package.HotPackage \
._translate_files(package_dir)
msg = "heat files were not generated correctly. Expected empty dict"
msg = "heat files were not generated correctly. Expected empty list"
self.assertEqual([], files, msg)