[Box Backup-commit] COMMIT r3201 - in box/trunk/test/backupstore: . testfiles

subversion at boxbackup.org subversion at boxbackup.org
Tue Oct 22 22:31:21 BST 2013


Author: chris
Date: 2013-10-22 22:31:20 +0100 (Tue, 22 Oct 2013)
New Revision: 3201

Modified:
   box/trunk/test/backupstore/testbackupstore.cpp
   box/trunk/test/backupstore/testfiles/query.conf
Log:
Add a test that Used block counts match expected values.

Modified: box/trunk/test/backupstore/testbackupstore.cpp
===================================================================
--- box/trunk/test/backupstore/testbackupstore.cpp	2013-10-02 19:13:07 UTC (rev 3200)
+++ box/trunk/test/backupstore/testbackupstore.cpp	2013-10-22 21:31:20 UTC (rev 3201)
@@ -38,6 +38,7 @@
 #include "ServerControl.h"
 #include "Socket.h"
 #include "SocketStreamTLS.h"
+#include "StoreStructure.h"
 #include "TLSContext.h"
 #include "Test.h"
 #include "autogen_BackupProtocol.h"
@@ -782,8 +783,27 @@
 		TEST_THAT(dir.GetNumberOfEntries() == 0);			
 	}
 
+	std::string root_dir_fn;
+	StoreStructure::MakeObjectFilename(
+		BackupProtocolListDirectory::RootDirectory, 
+		"backup/01234567/" /* mStoreRoot */, 0 /* mStoreDiscSet */, 
+		root_dir_fn, false /* EnsureDirectoryExists */);
+	std::auto_ptr<RaidFileRead> storedFile(RaidFileRead::Open(0, root_dir_fn));
+	int root_dir_blocks = storedFile->GetDiscUsageInBlocks();
+	std::auto_ptr<BackupProtocolAccountUsage> usage;
+	usage = protocol.QueryGetAccountUsage();
+
+	TEST_EQUAL_LINE(root_dir_blocks, usage->GetBlocksUsed(),
+		"wrong BlocksUsed");
+	TEST_EQUAL_LINE(0, usage->GetBlocksInOldFiles(),
+		"wrong BlocksInOldFiles");
+	TEST_EQUAL_LINE(0, usage->GetBlocksInDeletedFiles(), 
+		"wrong BlocksInDeletedFiles");
+	TEST_EQUAL_LINE(root_dir_blocks, usage->GetBlocksInDirectories(),
+		"wrong BlocksInDirectories");
+
 	// Store a file -- first make the encoded file
-	BackupStoreFilenameClear store1name("testfiles/file1");
+	BackupStoreFilenameClear store1name("file1");
 	{
 		FileStream out("testfiles/file1_upload1", O_WRONLY | O_CREAT | O_EXCL);
 		std::auto_ptr<IOStream> encoded(BackupStoreFile::EncodeFile("testfiles/file1", BackupProtocolListDirectory::RootDirectory, store1name));
@@ -893,6 +913,23 @@
 		}
 	}
 
+	std::string file1_fn;
+	StoreStructure::MakeObjectFilename(store1objid, 
+		"backup/01234567/" /* mStoreRoot */, 0 /* mStoreDiscSet */, 
+		file1_fn, false /* EnsureDirectoryExists */);
+	storedFile = RaidFileRead::Open(0, file1_fn);
+	int file1_blocks = storedFile->GetDiscUsageInBlocks();
+
+	usage = protocol.QueryGetAccountUsage();
+	TEST_EQUAL_LINE(root_dir_blocks + file1_blocks, usage->GetBlocksUsed(),
+		"wrong BlocksUsed");
+	TEST_EQUAL_LINE(0, usage->GetBlocksInOldFiles(),
+		"wrong BlocksInOldFiles");
+	TEST_EQUAL_LINE(0, usage->GetBlocksInDeletedFiles(), 
+		"wrong BlocksInDeletedFiles");
+	TEST_EQUAL_LINE(root_dir_blocks,
+		usage->GetBlocksInDirectories(), "wrong BlocksInDirectories");
+
 	// Try using GetFile on a directory
 	{
 		TEST_CHECK_THROWS(std::auto_ptr<BackupProtocolSuccess> getFile(protocol.QueryGetFile(BackupProtocolListDirectory::RootDirectory, BackupProtocolListDirectory::RootDirectory)),

Modified: box/trunk/test/backupstore/testfiles/query.conf
===================================================================
--- box/trunk/test/backupstore/testfiles/query.conf	2013-10-02 19:13:07 UTC (rev 3200)
+++ box/trunk/test/backupstore/testfiles/query.conf	2013-10-22 21:31:20 UTC (rev 3201)
@@ -17,6 +17,7 @@
 MaxUploadWait = 24
 FileTrackingSizeThreshold = 1024
 DiffingUploadSizeThreshold = 1024
+StorePort = 22011
 
 Server
 {




More information about the Boxbackup-commit mailing list