X-Git-Url: http://users.mur.at/ms/git/gitweb/?a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Ftests%2Ftests_aces_config.py;h=fb7524aab754a81a6a17dd7bdafa6aaac83ba2e6;hb=465abef462555baa505ed88b9e6e3f22b4a9c090;hp=dc29df299a4d197d58b4050dbe5ee73dbac50586;hpb=6eac5f132b3888eee16a8306d91b9405346f3ac2;p=OpenColorIO-Configs.git

diff --git a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py
index dc29df2..fb7524a 100644
--- a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py
+++ b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py
@@ -5,17 +5,23 @@
 Defines unit tests for *ACES* configuration.
 """
 
+from __future__ import division
+
 import hashlib
 import os
 import re
 import shutil
+import sys
 import tempfile
 import unittest
 
+sys.path.append(os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '..', '..')))
+
 from aces_ocio.utilities import files_walker
-from aces_ocio.create_aces_config import (
+from aces_ocio.generate_config import (
     ACES_OCIO_CTL_DIRECTORY_ENVIRON,
-    create_ACES_config)
+    generate_config)
 
 __author__ = 'ACES Developers'
 __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers'
@@ -32,9 +38,8 @@ __all__ = ['REFERENCE_CONFIG_ROOT_DIRECTORY',
 
 # TODO: Investigate how the current config has been generated to use it for
 # tests.
-# REFERENCE_CONFIG_ROOT_DIRECTORY = os.path.abspath(
-# os.path.join(os.path.dirname(__file__), '..', '..'))
-REFERENCE_CONFIG_ROOT_DIRECTORY = '/colour-science/colour-ramblings/ocio/aces'
+REFERENCE_CONFIG_ROOT_DIRECTORY = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 HASH_TEST_PATTERNS = ('\.3dl', '\.lut', '\.csp')
 UNHASHABLE_TEST_PATTERNS = ('\.icc', '\.ocio')
@@ -99,11 +104,12 @@ class TestACESConfig(unittest.TestCase):
         hashes = {}
         for path in files_walker(directory,
                                  filters_in=filters_in,
-                                 filters_out=filters_out):
+                                 filters_out=filters_out,
+                                 flags=flags):
             with open(path) as file:
-                hash = hashlib.md5(
+                digest = hashlib.md5(
                     re.sub('\s', '', file.read())).hexdigest()
-            hashes[path.replace(directory, '')] = hash
+            hashes[path.replace(directory, '')] = digest
         return hashes
 
     def test_ACES_config(self):
@@ -112,8 +118,8 @@ class TestACESConfig(unittest.TestCase):
         generated configuration and comparing them to the existing one.
         """
 
-        self.assertTrue(create_ACES_config(self.__aces_ocio_ctl_directory,
-                                         self.__temporary_directory))
+        self.assertTrue(generate_config(self.__aces_ocio_ctl_directory,
+                                        self.__temporary_directory))
 
         reference_hashes = self.directory_hashes(
             REFERENCE_CONFIG_ROOT_DIRECTORY,