Merge pull request #1266 from omarahmed1111/Fix-device-retain-release-tests

Fix device CTS tests for retain/release

Author: kbenzie

test/conformance/device/urDeviceRelease.cpp

@@ -8,8 +8,6 @@ struct urDeviceReleaseTest : uur::urAllDevicesTest {};
 
 TEST_F(urDeviceReleaseTest, Success) {
     for (auto device : devices) {
-        ASSERT_SUCCESS(urDeviceRetain(device));
-
         uint32_t prevRefCount = 0;
         ASSERT_SUCCESS(uur::GetObjectReferenceCount(device, prevRefCount));
 
@@ -57,6 +55,8 @@ TEST_F(urDeviceReleaseTest, SuccessSubdevices) {
         ASSERT_SUCCESS(uur::GetObjectReferenceCount(sub_device, refCount));
 
         ASSERT_GT(prevRefCount, refCount);
+
+        EXPECT_SUCCESS(urDeviceRelease(sub_device));
     }
 }
 

test/conformance/device/urDeviceRetain.cpp

@@ -20,8 +20,6 @@ TEST_F(urDeviceRetainTest, Success) {
         /* If device is a root level device, the device reference counts should
          * remain unchanged */
         ASSERT_EQ(prevRefCount, refCount);
-
-        EXPECT_SUCCESS(urDeviceRelease(device));
     }
 }
 
@@ -57,6 +55,7 @@ TEST_F(urDeviceRetainTest, SuccessSubdevices) {
         ASSERT_LT(prevRefCount, refCount);
 
         EXPECT_SUCCESS(urDeviceRelease(sub_device));
+        EXPECT_SUCCESS(urDeviceRelease(sub_device));
     }
 }