Changeset 1006 for box/trunk/test/backupstore/testbackupstore.cpp

Timestamp:

12/10/2006 23:23:32 (6 years ago)

Author:

chris

Message:

• We cannot open multiple connections to the server on Win32, so work around.

File:

• box/trunk/test/backupstore/testbackupstore.cpp (modified) (4 diffs)

box/trunk/test/backupstore/testbackupstore.cpp

@@ -932 +932 @@
                 TEST_THAT(loginConf->GetClientStoreMarker() == 0);
 
+#ifndef WIN32
                 // Check that we can't open a new connection which requests write permissions
                 {
@@ -943 +944 @@
                         protocol.QueryFinished();
                 }
+#endif
                 
                 // Set the client store marker
                 protocol.QuerySetClientStoreMarker(0x8732523ab23aLL);
 
+#ifndef WIN32
                 // Open a new connection which is read only
                 SocketStreamTLS connReadOnly;
@@ -965 +968 @@
                         TEST_THAT(loginConf->GetClientStoreMarker() == 0x8732523ab23aLL);
                 }
+#else // WIN32
+                BackupProtocolClient& protocolReadOnly(protocol);
+#endif
 
                 test_server_1(protocol, protocolReadOnly);
-
 
                 // Create and upload some test files
@@ -1440 +1445 @@
                         
                 // Finish the connections
+#ifndef WIN32
                 protocolReadOnly.QueryFinished();
+#endif
                 protocol.QueryFinished();
                 
                 // Close logs
+#ifndef WIN32
                 ::fclose(protocolReadOnlyLog);
+#endif
                 ::fclose(protocolLog);
         }