[Box Backup-commit] COMMIT r3161 - box/trunk/test/backupstore

[subversion at boxbackup.org]

Author: chris
Date: 2012-11-18 16:34:10 +0000 (Sun, 18 Nov 2012)
New Revision: 3161

Modified:
   box/trunk/test/backupstore/testbackupstore.cpp
Log:
Fix testbackupstore: don't keep using a reference to a protocol object
that's been disposed (Windows only).


Modified: box/trunk/test/backupstore/testbackupstore.cpp
===================================================================
--- box/trunk/test/backupstore/testbackupstore.cpp	2012-11-18 16:32:11 UTC (rev 3160)
+++ box/trunk/test/backupstore/testbackupstore.cpp	2012-11-18 16:34:10 UTC (rev 3161)
@@ -1040,7 +1040,7 @@
 			TEST_THAT(loginConf->GetClientStoreMarker() == 0x8732523ab23aLL);
 		}
 #else // WIN32
-		BackupProtocolClient& protocolReadOnly(*apProtocol);
+		#define protocolReadOnly (*apProtocol)
 #endif
 
 		test_server_1(*apProtocol, protocolReadOnly);
@@ -2490,6 +2490,7 @@
 		*apInfo, "spurtle", false /* AccountEnabled */, extra_data);
 
 	// Delete the account to leave the store in the same state as before	
+	apInfo.reset();
 	TEST_THAT_ABORTONFAIL(::system(BBSTOREACCOUNTS
 		" -c testfiles/bbstored.conf delete 01234567 yes") == 0);
 	TestRemoteProcessMemLeaks("bbstoreaccounts.memleaks");