Merge pull request #4 from wgzintel/bell/case_refine

revert incorrect change for common cases
openvinotoolkit · Mar 30, 2023 · e1c902e · e1c902e
2 parents c2df03b + ad3073e
commit e1c902e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
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
@@ -93,7 +93,9 @@ std::vector<std::string> disabledTestPatterns() {
         R"(.*Behavior.*ExecutableNetworkBaseTest.*canSetConfigToExecNetWithIncorrectConfig.*)",
         R"(.*Hetero.*Behavior.*ExecutableNetworkBaseTest.*ExecGraphInfo.*)",
         R"(.*Hetero.*Behavior.*ExecutableNetworkBaseTest.*CanCreateTwoExeNetworksAndCheckFunction.*)",
-
+        // TODO: CVS-104942
+        R"(.*(Auto|Multi).*Behavior.*ExecutableNetworkBaseTest.*canLoadCorrectNetworkToGetExecutableAndCheckConfig.*)",
+        R"(.*(Auto|Multi).*SetPropLoadNetWorkGetPropTests.*)",
         // CPU does not support dynamic rank
         // Issue: CVS-66778
         R"(.*smoke_BehaviorTests.*InferFullyDynamicNetworkWith(S|G)etTensor.*)",

diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp
@@ -106,15 +106,17 @@ TEST_P(MultiDevice_Bind_oversubsciption_test, oversubsciptionOfInferRequest) {
 
 auto device_names_and_support_for_remote_blobs2 = []() {
     return std::vector<DevicesNamseAndProperties>{
+    // another GPU (the test will test its presence), different OCL contexts
+    // use GPU.0 as reference, expect auto to throw exception on other hardware contexts
 #ifdef ENABLE_INTEL_CPU
         //{{CPU}, {}},  // stand-alone CPU via MULTI (no GPU), no OCL context
-        {{CPU, "GPU.1"},
-         {ov::intel_auto::device_bind_buffer(true)}},  // CPU,GPU.1 via MULTI, no OCL context
-        {{CPU, "GPU.1"},
-         {ov::intel_auto::device_bind_buffer(false)}},  // CPU,GPU.1 via MULTI, no OCL context
+        {{"GPU.1", CPU},
+         {ov::intel_auto::device_bind_buffer(true)}},
+        {{"GPU.1", CPU},
+         {ov::intel_auto::device_bind_buffer(false)}},
 #endif
-        {{"GPU.1"}, {}},  // another GPU (the test will test its presence), different OCL contexts
-        {{"GPU.1"}, {ov::intel_auto::device_bind_buffer(true)}},  // another GPU (the test will test its presence), different OCL contexts
+        {{"GPU.1"}, {}},
+        {{"GPU.1"}, {ov::intel_auto::device_bind_buffer(true)}},
     };
 };
 

diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp
@@ -124,5 +124,9 @@ std::vector<std::string> disabledTestPatterns() {
 
             // Looks like the test is targeting CPU plugin and doesn't respect that execution graph may vary from plugin to plugin
             R"(.*ExecGraphSerializationTest.*)",
+
+            // TODO: support getconfig in auto/multi CVS-104942
+            // TODO: move auto/multi cases to dedicated unit tests
+            R"(.*(Auto|Multi).*SetPropLoadNetWorkGetPropTests.*)",
     };
 }
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
@@ -72,11 +72,7 @@ TEST_P(ExecutableNetworkBaseTest, canLoadCorrectNetworkToGetExecutableAndCheckCo
     auto execNet = ie->LoadNetwork(cnnNet, target_device, configuration);
     for (const auto& configItem : configuration) {
         InferenceEngine::Parameter param;
-        try {
-            param = execNet.GetConfig(configItem.first);
-        } catch (InferenceEngine::Exception&) {
-            ASSERT_NO_THROW(param = execNet.GetMetric(configItem.first));
-        }
+        ASSERT_NO_THROW(param = execNet.GetConfig(configItem.first));
         ASSERT_FALSE(param.empty());
         ASSERT_EQ(param, InferenceEngine::Parameter(configItem.second));
     }

diff --git a/src/tests/functional/plugin/shared/src/behavior/plugin/configuration_tests.cpp b/src/tests/functional/plugin/shared/src/behavior/plugin/configuration_tests.cpp
@@ -192,7 +192,7 @@ TEST_P(ExclusiveAsyncReqTests, excluAsyncReqTests) {
     ASSERT_NO_THROW(ie->LoadNetwork(cnnNet, target_device, configuration));
 }
 
-TEST_P(SetPropLoadNetWorkGetPropTests, ieSetGetConfigAndLoadNetWorkSetGetPropertyTest) {
+TEST_P(SetPropLoadNetWorkGetPropTests, SetPropLoadNetWorkGetProperty) {
     ASSERT_NO_THROW(ie->SetConfig(configuration, target_device));
 
     InferenceEngine::ExecutableNetwork exeNetWork;
@@ -201,11 +201,7 @@ TEST_P(SetPropLoadNetWorkGetPropTests, ieSetGetConfigAndLoadNetWorkSetGetPropert
     //ie's setConfig and LoadNetwork should not affect each other, for config settings
     for (const auto& property_item : loadNetWorkConfig) {
         InferenceEngine::Parameter exeNetProperty;
-        try {
-            exeNetProperty = exeNetWork.GetConfig(property_item.first);
-        } catch (InferenceEngine::Exception&) {
-            ASSERT_NO_THROW(exeNetProperty = exeNetWork.GetMetric(property_item.first));
-        }
+        ASSERT_NO_THROW(exeNetProperty = exeNetWork.GetConfig(property_item.first));
         ASSERT_EQ(property_item.second, exeNetProperty.as<std::string>());
     }