diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 20ffa0bf60d2c8..296682606d857f 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -333,12 +333,12 @@ INSTANTIATE_TEST_SUITE_P(smoke_HETERO_OVClassLoadNetworkWithSecondaryPropertiesT // IE Class load and check network with ov::device::properties INSTANTIATE_TEST_SUITE_P(smoke_CPU_OVClassLoadNetworkAndCheckWithSecondaryPropertiesTest, OVClassLoadNetworkAndCheckSecondaryPropertiesTest, - ::testing::Combine(::testing::Values("CPU", "MULTI:CPU"), + ::testing::Combine(::testing::Values("CPU"), ::testing::ValuesIn(configsDeviceProperties))); INSTANTIATE_TEST_SUITE_P(smoke_CPU_OVClassLoadNetworkAndCheckWithSecondaryPropertiesDoubleTest, OVClassLoadNetworkAndCheckSecondaryPropertiesTest, - ::testing::Combine(::testing::Values("CPU", "MULTI:CPU"), + ::testing::Combine(::testing::Values("CPU"), ::testing::ValuesIn(configsDevicePropertiesDouble))); INSTANTIATE_TEST_SUITE_P( smoke_OVClassLoadNetworkTest, OVClassLoadNetworkTest, diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index e6ecc7af8d861d..a82a7057607426 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -92,11 +92,6 @@ std::vector disabledTestPatterns() { R"(.*Behavior.*ExecutableNetworkBaseTest.*canSetConfigToExecNetWithIncorrectConfig.*)", R"(.*Hetero.*Behavior.*ExecutableNetworkBaseTest.*ExecGraphInfo.*)", R"(.*Hetero.*Behavior.*ExecutableNetworkBaseTest.*CanCreateTwoExeNetworksAndCheckFunction.*)", - R"(.*Hetero.*Behavior.*ExecutableNetworkBaseTest.*canLoadCorrectNetworkToGetMetricAndCheckConfig.*)", - // AutoExcutableNetwork does not support GetConfig - R"(.*(Auto|Multi).*Behavior.*ExecutableNetworkBaseTest.*canLoadCorrectNetworkToGetExecutableAndCheckConfig.*)", - // AutoExcutableNetwork GetMetric does not support key ov::num_streams - R"(.*smoke_CPU.*OVClassLoadNetworkAndCheckSecondaryProperties.*LoadNetworkAndCheckSecondaryPropertiesTest.*)", // CPU does not support dynamic rank // Issue: CVS-66778 diff --git a/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp b/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp index 96a87f6056c4ee..85b3c6e6284cdb 100644 --- a/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp @@ -72,7 +72,11 @@ TEST_P(ExecutableNetworkBaseTest, canLoadCorrectNetworkToGetExecutableAndCheckCo auto execNet = ie->LoadNetwork(cnnNet, target_device, configuration); for (const auto& configItem : configuration) { InferenceEngine::Parameter param; - ASSERT_NO_THROW(param = execNet.GetConfig(configItem.first)); + try { + param = execNet.GetConfig(configItem.first); + } catch (InferenceEngine::Exception&) { + ASSERT_NO_THROW(param = execNet.GetMetric(configItem.first)); + } ASSERT_FALSE(param.empty()); ASSERT_EQ(param, InferenceEngine::Parameter(configItem.second)); } @@ -294,16 +298,6 @@ TEST_P(ExecutableNetworkBaseTest, pluginDoesNotChangeOriginalNetwork) { compare_functions(cnnNet.getFunction(), referenceNetwork); } -TEST_P(ExecutableNetworkBaseTest, canLoadCorrectNetworkToGetMetricAndCheckConfig) { - auto execNet = ie->LoadNetwork(cnnNet, target_device, configuration); - for (const auto& configItem : configuration) { - InferenceEngine::Parameter param; - ASSERT_NO_THROW(param = execNet.GetMetric(configItem.first)); - ASSERT_FALSE(param.empty()); - ASSERT_EQ(param, InferenceEngine::Parameter(configItem.second)); - } -} - class ExecNetSetPrecision : public BehaviorTestsUtils::BehaviorTestsBasicBase, public BehaviorTestsUtils::IEExecutableNetworkTestBase { protected: