Skip to content

Adsk contrib - Ignore info log from inactive colorspaces test #1822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doug-walker merged 3 commits into from
Aug 26, 2023
Merged

Adsk contrib - Ignore info log from inactive colorspaces test #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfc03c4
Fixing a warning in one of the python unit test
cedrik-fuoco-adsk May 16, 2023
f47ad9d
Using sudio config instead of cg config where it makes sense
cedrik-fuoco-adsk May 18, 2023
ebd2fb6
Merge branch 'main' into adsk_contrib/ignore-info-log-from-inactive-c…
doug-walker Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions tests/cpu/Config_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

{
Expand Down
4 changes: 2 additions & 2 deletions tests/python/ConfigTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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()

# *****************************
Expand Down
5 changes: 5 additions & 0 deletions tests/python/UnitTestUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ def __exit__(self, exc_type, exc_val, exc_tb):
- !<ColorSpace>
name: c3
categories: [sample]

- !<ColorSpace>
name: c4
encoding: log
categories: [sample]
"""

SAMPLE_CONFIG = """ocio_profile_version: 2
Expand Down