openstack/horizon
Code Issues Proposed changes

Proving JS source files in consistent order

Browse Source 
In some deployment environment, the JS source files need to be listed
in consistent order so that they will have the same cache key value for
the compressed JS file.

Change-Id: Ib187a85b7a1fca03c0eb78b411cf121017d40890
Closes-Bug: #1476383
This commit is contained in:
Shaoquan Chen 2015-07-21 12:18:53 -06:00
parent 8ebaaf95e8
commit b6399c6904
2 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
horizon/test/tests/test_file_discovery.py
View File

@ -53,6 +53,12 @@ def fake_walk(path):
yield root, [], files
def another_fake_walk(path):
for root, files in reversed(test_structure):
if root.startswith(path):
yield root, [], files
class FinderTests(unittest.TestCase):
def setUp(self):
self.old_walk = fd.walk
@ -196,13 +202,50 @@ class FinderTests(unittest.TestCase):
self.assertEqual(len(test_files), 8)
self.assertEqual(len(templates), 2)
self.assertTrue(sources[0].endswith('.module.js'))
self.assertTrue(sources[1].endswith('.module.js'))
self.assertTrue(sources[0].endswith('a.module.js'))
self.assertTrue(sources[1].endswith('b.module.js'))
self.assertTrue(sources[2].endswith('.controller.js'))
self.assertTrue(sources[3].endswith('.directive.js'))
self.assertTrue(sources[4].endswith('.controller.js'))
self.assertTrue(sources[5].endswith('.directive.js'))
self.assertTrue(sources[2].endswith('a.controller.js'))
self.assertTrue(sources[3].endswith('a.directive.js'))
self.assertTrue(sources[4].endswith('b.controller.js'))
self.assertTrue(sources[5].endswith('b.directive.js'))
self.assertTrue(test_files[0].endswith('.mock.js'))
self.assertTrue(test_files[1].endswith('.mock.js'))
self.assertTrue(test_files[2].endswith('.spec.js'))
self.assertTrue(test_files[3].endswith('.spec.js'))
self.assertTrue(test_files[4].endswith('.spec.js'))
self.assertTrue(test_files[5].endswith('.spec.js'))
self.assertTrue(test_files[6].endswith('.spec.js'))
self.assertTrue(test_files[7].endswith('.spec.js'))
self.assertTrue(templates[0].endswith('.html'))
self.assertTrue(templates[1].endswith('.html'))
#
# populate_horizon_config()
#
def test_populate_horizon_config_consistent_result(self):
fd.walk = another_fake_walk
horizon_config = {}
fd.populate_horizon_config(horizon_config, base_path)
sources = horizon_config['js_files']
test_files = horizon_config['js_spec_files']
templates = horizon_config['external_templates']
self.assertEqual(len(sources), 6)
self.assertEqual(len(test_files), 8)
self.assertEqual(len(templates), 2)
self.assertTrue(sources[0].endswith('a.module.js'))
self.assertTrue(sources[1].endswith('b.module.js'))
self.assertTrue(sources[2].endswith('a.controller.js'))
self.assertTrue(sources[3].endswith('a.directive.js'))
self.assertTrue(sources[4].endswith('b.controller.js'))
self.assertTrue(sources[5].endswith('b.directive.js'))
self.assertTrue(test_files[0].endswith('.mock.js'))
self.assertTrue(test_files[1].endswith('.mock.js'))

2
horizon/utils/file_discovery.py
View File

@ -32,7 +32,7 @@ def discover_files(base_path, sub_path='', ext='', trim_base_path=False):
file_list.extend([path.join(root, file_name)
for file_name in files
if file_name.endswith(ext)])
return file_list
return sorted(file_list)
def sort_js_files(js_files):