[Box Backup-commit] COMMIT r1497 - box/chris/general/test/backupstore
boxbackup-dev@fluffy.co.uk
boxbackup-dev@fluffy.co.uk
Sun, 25 Mar 2007 00:24:40 +0000
Author: chris
Date: 2007-03-25 00:24:40 +0000 (Sun, 25 Mar 2007)
New Revision: 1497
Modified:
box/chris/general/test/backupstore/testbackupstore.cpp
Log:
Revert to unix path separators to reduce diff to chris/merge
Modified: box/chris/general/test/backupstore/testbackupstore.cpp
===================================================================
--- box/chris/general/test/backupstore/testbackupstore.cpp 2007-03-25 00:23:59 UTC (rev 1496)
+++ box/chris/general/test/backupstore/testbackupstore.cpp 2007-03-25 00:24:40 UTC (rev 1497)
@@ -973,6 +973,7 @@
#endif
test_server_1(protocol, protocolReadOnly);
+
// Create and upload some test files
int64_t maxID = 0;
for(int t = 0; t < UPLOAD_NUM; ++t)
@@ -1530,48 +1531,35 @@
// The test block to a file
{
- FileStream f("testfiles" DIRECTORY_SEPARATOR
- "testenc1", O_WRONLY | O_CREAT | O_EXCL);
+ FileStream f("testfiles/testenc1", O_WRONLY | O_CREAT | O_EXCL);
f.Write(encfile, sizeof(encfile));
}
// Encode it
{
- FileStream out("testfiles" DIRECTORY_SEPARATOR
- "testenc1_enc", O_WRONLY | O_CREAT | O_EXCL);
- BackupStoreFilenameClear name("testfiles"
- DIRECTORY_SEPARATOR "testenc1");
+ FileStream out("testfiles/testenc1_enc", O_WRONLY | O_CREAT | O_EXCL);
+ BackupStoreFilenameClear name("testfiles/testenc1");
- std::auto_ptr<IOStream> encoded(
- BackupStoreFile::EncodeFile(
- "testfiles" DIRECTORY_SEPARATOR
- "testenc1", 32, name));
+ std::auto_ptr<IOStream> encoded(BackupStoreFile::EncodeFile("testfiles/testenc1", 32, name));
encoded->CopyStreamTo(out);
}
// Verify it
{
- FileStream enc("testfiles" DIRECTORY_SEPARATOR
- "testenc1_enc");
+ FileStream enc("testfiles/testenc1_enc");
TEST_THAT(BackupStoreFile::VerifyEncodedFileFormat(enc) == true);
}
// Decode it
{
- FileStream enc("testfiles" DIRECTORY_SEPARATOR
- "testenc1_enc");
- BackupStoreFile::DecodeFile(enc, "testfiles"
- DIRECTORY_SEPARATOR "testenc1_orig",
- IOStream::TimeOutInfinite);
+ FileStream enc("testfiles/testenc1_enc");
+ BackupStoreFile::DecodeFile(enc, "testfiles/testenc1_orig", IOStream::TimeOutInfinite);
}
// Read in rebuilt original, and compare contents
{
- TEST_THAT(TestGetFileSize("testfiles"
- DIRECTORY_SEPARATOR "testenc1_orig")
- == sizeof(encfile));
- FileStream in("testfiles" DIRECTORY_SEPARATOR
- "testenc1_orig");
+ TEST_THAT(TestGetFileSize("testfiles/testenc1_orig") == sizeof(encfile));
+ FileStream in("testfiles/testenc1_orig");
int encfile_i[ENCFILE_SIZE];
in.Read(encfile_i, sizeof(encfile_i));
TEST_THAT(memcmp(encfile, encfile_i, sizeof(encfile)) == 0);
@@ -1579,8 +1567,7 @@
// Check how many blocks it had, and test the stream based interface
{
- FileStream enc("testfiles" DIRECTORY_SEPARATOR
- "testenc1_enc");
+ FileStream enc("testfiles/testenc1_enc");
std::auto_ptr<BackupStoreFile::DecodedStream> decoded(BackupStoreFile::DecodeFileStream(enc, IOStream::TimeOutInfinite));
CollectInBufferStream d;
decoded->CopyStreamTo(d, IOStream::TimeOutInfinite, 971 /* buffer block size */);
@@ -1594,14 +1581,10 @@
// Test that the last block in a file, if less than 256 bytes, gets put into the last block
{
#define FILE_SIZE_JUST_OVER ((4096*2)+58)
- FileStream f("testfiles" DIRECTORY_SEPARATOR
- "testenc2", O_WRONLY | O_CREAT | O_EXCL);
+ FileStream f("testfiles/testenc2", O_WRONLY | O_CREAT | O_EXCL);
f.Write(encfile + 2, FILE_SIZE_JUST_OVER);
BackupStoreFilenameClear name("testenc2");
- std::auto_ptr<IOStream> encoded(
- BackupStoreFile::EncodeFile(
- "testfiles" DIRECTORY_SEPARATOR
- "testenc2", 32, name));
+ std::auto_ptr<IOStream> encoded(BackupStoreFile::EncodeFile("testfiles/testenc2", 32, name));
CollectInBufferStream e;
encoded->CopyStreamTo(e);
e.SetForReading();
@@ -1617,8 +1600,7 @@
// Test that reordered streams work too
{
- FileStream enc("testfiles" DIRECTORY_SEPARATOR
- "testenc1_enc");
+ FileStream enc("testfiles/testenc1_enc");
std::auto_ptr<IOStream> reordered(BackupStoreFile::ReorderFileToStreamOrder(&enc, false));
std::auto_ptr<BackupStoreFile::DecodedStream> decoded(BackupStoreFile::DecodeFileStream(*reordered, IOStream::TimeOutInfinite));
CollectInBufferStream d;
@@ -1650,14 +1632,9 @@
// Store info
{
RaidFileWrite::CreateDirectory(0, "test-info");
- BackupStoreInfo::CreateNew(76, "test-info" DIRECTORY_SEPARATOR,
- 0, 3461231233455433LL, 2934852487LL);
- TEST_CHECK_THROWS(BackupStoreInfo::CreateNew(76,
- "test-info" DIRECTORY_SEPARATOR, 0, 0, 0),
- RaidFileException, CannotOverwriteExistingFile);
- std::auto_ptr<BackupStoreInfo> info(
- BackupStoreInfo::Load(76,
- "test-info" DIRECTORY_SEPARATOR, 0, true));
+ BackupStoreInfo::CreateNew(76, "test-info/", 0, 3461231233455433LL, 2934852487LL);
+ TEST_CHECK_THROWS(BackupStoreInfo::CreateNew(76, "test-info/", 0, 0, 0), RaidFileException, CannotOverwriteExistingFile);
+ std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, "test-info/", 0, true));
TEST_CHECK_THROWS(info->Save(), BackupStoreException, StoreInfoIsReadOnly);
TEST_CHECK_THROWS(info->ChangeBlocksUsed(1), BackupStoreException, StoreInfoIsReadOnly);
TEST_CHECK_THROWS(info->ChangeBlocksInOldFiles(1), BackupStoreException, StoreInfoIsReadOnly);
@@ -1666,8 +1643,7 @@
TEST_CHECK_THROWS(info->AddDeletedDirectory(2), BackupStoreException, StoreInfoIsReadOnly);
}
{
- std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76,
- "test-info" DIRECTORY_SEPARATOR, 0, false));
+ std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, "test-info/", 0, false));
info->ChangeBlocksUsed(8);
info->ChangeBlocksInOldFiles(9);
info->ChangeBlocksInDeletedFiles(10);
@@ -1685,8 +1661,7 @@
info->Save();
}
{
- std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76,
- "test-info" DIRECTORY_SEPARATOR, 0, true));
+ std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(76, "test-info/", 0, true));
TEST_THAT(info->GetBlocksUsed() == 7);
TEST_THAT(info->GetBlocksInOldFiles() == 5);
TEST_THAT(info->GetBlocksInDeletedFiles() == 1);
@@ -1704,17 +1679,14 @@
// Context
TLSContext context;
context.Initialise(false /* client */,
- "testfiles" DIRECTORY_SEPARATOR "clientCerts.pem",
- "testfiles" DIRECTORY_SEPARATOR "clientPrivKey.pem",
- "testfiles" DIRECTORY_SEPARATOR "clientTrustedCAs.pem");
+ "testfiles/clientCerts.pem",
+ "testfiles/clientPrivKey.pem",
+ "testfiles/clientTrustedCAs.pem");
// First, try logging in without an account having been created... just make sure login fails.
-#ifdef WIN32
- int pid = LaunchServer("..\\..\\bin\\bbstored\\bbstored testfiles/bbstored.conf", "testfiles/bbstored.pid");
-#else
- int pid = LaunchServer("../../bin/bbstored/bbstored testfiles/bbstored.conf", "testfiles/bbstored.pid");
-#endif
+ int pid = LaunchServer(BBSTORED " testfiles/bbstored.conf",
+ "testfiles/bbstored.pid");
TEST_THAT(pid != -1 && pid != 0);
if(pid > 0)
@@ -1975,11 +1947,7 @@
// Use the setup crypto command to set up all these keys, so that the bbackupquery command can be used
// for seeing what's going on.
-#ifdef WIN32
- BackupClientCryptoKeys_Setup("testfiles\\bbackupd.keys");
-#else
BackupClientCryptoKeys_Setup("testfiles/bbackupd.keys");
-#endif
// encode in some filenames -- can't do static initialisation
// because the key won't be set up when these are initialised