Changeset 2654

Timestamp:

08/03/2010 21:22:09 (2 years ago)

Author:

chris

Message:

Merge [2646] into 0.11rc7.

File:

• box/RELEASE/0.11rc7/test/backupstorepatch/testbackupstorepatch.cpp (modified) (3 diffs)

box/RELEASE/0.11rc7/test/backupstorepatch/testbackupstorepatch.cpp

@@ -14 +14 @@
 #include <signal.h>
 
+#include "autogen_BackupProtocolClient.h"
+#include "BackupClientCryptoKeys.h"
+#include "BackupClientFileAttributes.h"
+#include "BackupStoreAccountDatabase.h"
+#include "BackupStoreAccounts.h"
+#include "BackupStoreConstants.h"
+#include "BackupStoreDirectory.h"
+#include "BackupStoreException.h"
+#include "BackupStoreFile.h"
+#include "BackupStoreFilenameClear.h"
+#include "BackupStoreInfo.h"
+#include "BoxPortsAndFiles.h"
+#include "CollectInBufferStream.h"
+#include "FileStream.h"
+#include "MemBlockStream.h"
+#include "RaidFileController.h"
+#include "RaidFileException.h"
+#include "RaidFileRead.h"
+#include "RaidFileUtil.h"
+#include "RaidFileWrite.h"
+#include "SSLLib.h"
+#include "ServerControl.h"
+#include "Socket.h"
+#include "SocketStreamTLS.h"
+#include "StoreStructure.h"
+#include "TLSContext.h"
 #include "Test.h"
-#include "autogen_BackupProtocolClient.h"
-#include "SSLLib.h"
-#include "TLSContext.h"
-#include "SocketStreamTLS.h"
-#include "BoxPortsAndFiles.h"
-#include "BackupStoreConstants.h"
-#include "Socket.h"
-#include "BackupStoreFilenameClear.h"
-#include "CollectInBufferStream.h"
-#include "BackupStoreDirectory.h"
-#include "BackupStoreFile.h"
-#include "FileStream.h"
-#include "RaidFileController.h"
-#include "RaidFileRead.h"
-#include "RaidFileWrite.h"
-#include "BackupStoreInfo.h"
-#include "BackupStoreException.h"
-#include "RaidFileException.h"
-#include "MemBlockStream.h"
-#include "BackupClientFileAttributes.h"
-#include "BackupClientCryptoKeys.h"
-#include "ServerControl.h"
 
 #include "MemLeakFindOn.h"
@@ -321 +325 @@
         // Check the basic directory stuff works
         test_depends_in_dirs();
-
-        // First, try logging in without an account having been created... just make sure login fails.
+        
+        std::string storeRootDir;
+        int discSet = 0;
+        {
+                std::auto_ptr<BackupStoreAccountDatabase> apDatabase(
+                        BackupStoreAccountDatabase::Read("testfiles/accounts.txt"));
+                BackupStoreAccounts accounts(*apDatabase);
+                accounts.GetAccountRoot(0x1234567, storeRootDir, discSet);
+        }
+        RaidFileDiscSet rfd(rcontroller.GetDiscSet(discSet));
+
         int pid = LaunchServer(BBSTORED " testfiles/bbstored.conf", 
                 "testfiles/bbstored.pid");
@@ -479 +492 @@
                                         {
                                                 TEST_THAT(test_files[f].HasBeenDeleted);
+                                                // check that unreferenced
+                                                // object was removed by
+                                                // housekeeping
+                                                std::string filenameOut;
+                                                int startDisc = 0;
+                                                StoreStructure::MakeObjectFilename(
+                                                        test_files[f].IDOnServer,
+                                                        storeRootDir, discSet,
+                                                        filenameOut,
+                                                        false /* don't bother ensuring the directory exists */);
+                                                TEST_EQUAL(RaidFileUtil::NoFile,
+                                                        RaidFileUtil::RaidFileExists(
+                                                                rfd, filenameOut));
                                         }
                                         else