projects
/
OpenColorIO-Configs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7 from selfshadow/master
[OpenColorIO-Configs.git]
/
aces_1.0.0
/
python
/
aces_ocio
/
tests
/
tests_aces_config.py
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
4d8a38a
..
fb7524a
100644
(file)
--- 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
@@
-19,9
+19,9
@@
sys.path.append(os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..')))
from aces_ocio.utilities import files_walker
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,
ACES_OCIO_CTL_DIRECTORY_ENVIRON,
-
create_ACES
_config)
+
generate
_config)
__author__ = 'ACES Developers'
__copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers'
__author__ = 'ACES Developers'
__copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers'
@@
-40,7
+40,6
@@
__all__ = ['REFERENCE_CONFIG_ROOT_DIRECTORY',
# tests.
REFERENCE_CONFIG_ROOT_DIRECTORY = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..', '..'))
# 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'
HASH_TEST_PATTERNS = ('\.3dl', '\.lut', '\.csp')
UNHASHABLE_TEST_PATTERNS = ('\.icc', '\.ocio')
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.
"""
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,
reference_hashes = self.directory_hashes(
REFERENCE_CONFIG_ROOT_DIRECTORY,