diff --git a/tests/cpu/Config_tests.cpp b/tests/cpu/Config_tests.cpp index bf8126b627..56f812ae99 100644 --- a/tests/cpu/Config_tests.cpp +++ b/tests/cpu/Config_tests.cpp @@ -5662,17 +5662,16 @@ OCIO_ADD_TEST(Config, inactive_color_space) OCIO::COLORSPACE_ALL, 1)); } -OCIO_ADD_TEST(Config, inactive_colorspaces) +OCIO_ADD_TEST(Config, is_inactive) { // Using Built-in config to test the getInactiveColorSpace method. - const std::string cgConfigName = "cg-config-v1.0.0_aces-v1.3_ocio-v2.1"; + const std::string cgConfigName = "studio-config-v1.0.0_aces-v1.3_ocio-v2.1"; OCIO::ConstConfigRcPtr config; OCIO_CHECK_NO_THROW( config = OCIO::Config::CreateFromBuiltinConfig(cgConfigName.c_str()) ); OCIO_REQUIRE_ASSERT(config); - OCIO_CHECK_NO_THROW(config->validate()); { diff --git a/tests/python/ConfigTest.py b/tests/python/ConfigTest.py index f88eb736be..c95e0809aa 100644 --- a/tests/python/ConfigTest.py +++ b/tests/python/ConfigTest.py @@ -1217,7 +1217,7 @@ def test_resolve_config(self): ) def test_inactive_colorspaces(self): - config = OCIO.Config.CreateFromBuiltinConfig("cg-config-v1.0.0_aces-v1.3_ocio-v2.1") + config = OCIO.Config.CreateFromBuiltinConfig("studio-config-v1.0.0_aces-v1.3_ocio-v2.1") config.validate() # Test various combinations of input. @@ -1234,7 +1234,7 @@ def test_inactive_colorspaces(self): self.assertTrue(config.isInactiveColorSpace("Rec.1886 Rec.2020 - Display")) def test_roles(self): - config = OCIO.Config.CreateFromBuiltinConfig("cg-config-v1.0.0_aces-v1.3_ocio-v2.1") + config = OCIO.Config.CreateFromBuiltinConfig("studio-config-v1.0.0_aces-v1.3_ocio-v2.1") config.validate() # ***************************** diff --git a/tests/python/UnitTestUtils.py b/tests/python/UnitTestUtils.py index 1b83c1cb92..dd41586547 100644 --- a/tests/python/UnitTestUtils.py +++ b/tests/python/UnitTestUtils.py @@ -180,6 +180,11 @@ def __exit__(self, exc_type, exc_val, exc_tb): - ! name: c3 categories: [sample] + + - ! + name: c4 + encoding: log + categories: [sample] """ SAMPLE_CONFIG = """ocio_profile_version: 2