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=0cc52e33a3822b22e7cc30bf44e80e83c6de678f;hp=f3dab5164bc7da87d177778f5f988fd23c986f41;hpb=bac8fe03757f010e000b67bf58e3b17da8f47e0a;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 f3dab51..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 @@ -16,12 +16,12 @@ import tempfile import unittest sys.path.append(os.path.abspath( - os.path.join(os.path.dirname(__file__), '..', '..') ) ) + os.path.join(os.path.dirname(__file__), '..', '..'))) from aces_ocio.utilities import files_walker -from aces_ocio.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' @@ -39,8 +39,7 @@ __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' + os.path.join(os.path.dirname(__file__), '..', '..', '..')) HASH_TEST_PATTERNS = ('\.3dl', '\.lut', '\.csp') UNHASHABLE_TEST_PATTERNS = ('\.icc', '\.ocio') @@ -119,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,