Security-57740.51.3.tar.gz

[apple/security.git] / OSX / sec / securityd / Regressions / secd-52-account-changed.c

diff --git a/OSX/sec/securityd/Regressions/secd-52-account-changed.c b/OSX/sec/securityd/Regressions/secd-52-account-changed.c
index ea8db431cfeed3fc4827915e51aa6f882ddd8010..791558f9abf1616a640ae786afac5bd9a02551a3 100644 (file)
--- a/OSX/sec/securityd/Regressions/secd-52-account-changed.c
+++ b/OSX/sec/securityd/Regressions/secd-52-account-changed.c
@@ -109,9 +109,20 @@ static void tests(void)
 
     accounts_agree_internal("bob&alice pair", bob_account, alice_account, false);
     accounts_agree_internal("bob&carol pair", bob_account, carol_account, false);
 
     accounts_agree_internal("bob&alice pair", bob_account, alice_account, false);
     accounts_agree_internal("bob&carol pair", bob_account, carol_account, false);

+    CFDictionaryRef alice_devstate = SOSTestSaveStaticAccountState(alice_account);
+    CFDictionaryRef bob_devstate = SOSTestSaveStaticAccountState(bob_account);
+    CFDictionaryRef carol_devstate = SOSTestSaveStaticAccountState(carol_account);

 
     /* ==================== Three Accounts in circle =============================================*/
     InjectChangeToMulti(changes, CFSTR("^AccountChanged"), CFSTR("none"), alice_account, bob_account, carol_account, NULL);
 
     /* ==================== Three Accounts in circle =============================================*/
     InjectChangeToMulti(changes, CFSTR("^AccountChanged"), CFSTR("none"), alice_account, bob_account, carol_account, NULL);

+    
+    SOSTestRestoreAccountState(alice_account, alice_devstate);
+    SOSTestRestoreAccountState(bob_account, bob_devstate);
+    SOSTestRestoreAccountState(carol_account, carol_devstate);
+    
+    CFReleaseNull(alice_devstate);
+    CFReleaseNull(bob_devstate);
+    CFReleaseNull(carol_devstate);

 
     SOSAccountEnsureFactoryCirclesTest(alice_account, CFSTR("Alice"));
     SOSAccountEnsureFactoryCirclesTest(bob_account, CFSTR("Bob"));
 
     SOSAccountEnsureFactoryCirclesTest(alice_account, CFSTR("Alice"));
     SOSAccountEnsureFactoryCirclesTest(bob_account, CFSTR("Bob"));


@@ -184,21 +195,12 @@ static void tests(void)
     accounts_agree_internal("bob&carol pair", bob_account, carol_account, false);
     
     CFReleaseSafe(cfpassword2);
     accounts_agree_internal("bob&carol pair", bob_account, carol_account, false);
     
     CFReleaseSafe(cfpassword2);

-    
-    CFReleaseNull(alice_account);
-    CFReleaseNull(bob_account);
-    CFReleaseNull(carol_account);
-
-    SOSUnregisterAllTransportMessages();
-    SOSUnregisterAllTransportCircles();
-    SOSUnregisterAllTransportKeyParameters();
-    CFArrayRemoveAllValues(key_transports);
-    CFArrayRemoveAllValues(circle_transports);
-    CFArrayRemoveAllValues(message_transports);

     CFReleaseNull(changes);
     CFReleaseNull(alice_account);
     CFReleaseNull(bob_account);
     CFReleaseNull(carol_account);
     CFReleaseNull(changes);
     CFReleaseNull(alice_account);
     CFReleaseNull(bob_account);
     CFReleaseNull(carol_account);

+    SOSTestCleanup();
+

 }
 
 
 }