Changeset 2127 for box/trunk/test

Timestamp:

04/04/2008 23:11:45 (4 years ago)

Author:

chris

Message:

Undo mangling by tailor

Location:

box/trunk/test

Files:

• backupdiff/testbackupdiff.cpp (modified) (2 diffs)
• basicserver/testbasicserver.cpp (modified) (2 diffs)
• bbackupd/testbbackupd.cpp (modified) (4 diffs)
• bbackupd/testfiles/bbackupd-temploc.conf (modified) (1 diff)
• bbackupd/testfiles/bbackupd.conf.in (modified) (1 diff)
• bbackupd/testfiles/bbstored.conf (modified) (1 diff)
• common/testcommon.cpp (modified) (3 diffs)
• compress/testcompress.cpp (modified) (1 diff)
• raidfile/testraidfile.cpp (modified) (1 diff)

box/trunk/test/backupdiff/testbackupdiff.cpp

@@ -111 +111 @@
         // number of blocks
         int64_t nblocks = box_ntoh64(hdr.mNumBlocks);
-        TRACE2("Reading index from '%s', has %lld blocks\n", filename, nblocks);
-        TRACE0("======== ===== ========== ======== ========\n   Index Where  EncSz/Idx     Size  WChcksm\n");
+        BOX_TRACE("Reading index from '" << filename << "', has " <<
+                nblocks << " blocks");
+        BOX_TRACE("======== ===== ========== ======== ========");
+        BOX_TRACE("   Index Where  EncSz/Idx     Size  WChcksm");
         // Read them all in
         int64_t nnew = 0, nold = 0;
@@ -120 +122 @@
                 TEST_THAT(enc.ReadFullBuffer(&en, sizeof(en), 0));
                 int64_t s = box_ntoh64(en.mEncodedSize);
-                if(s > 0)
-                {
-                        nnew++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d this  s=%8I64d", b, s);
-                        #else
-                        TRACE2("%8lld this  s=%8lld", b, s);
-                        #endif
-                }
-                else
-                {
-                        nold++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d other i=%8I64d", b, 0 - s);              
-                        #else
-                        TRACE2("%8lld other i=%8lld", b, 0 - s);                
-                        #endif
-                }
+
                 // Decode the rest
                 uint64_t iv = box_ntoh64(hdr.mEntryIVBase);
                 iv += b;
-                sBlowfishDecryptBlockEntry.SetIV(&iv);                  
+                sBlowfishDecryptBlockEntry.SetIV(&iv);
                 file_BlockIndexEntryEnc entryEnc;
-                sBlowfishDecryptBlockEntry.TransformBlock(&entryEnc, sizeof(entryEnc),
-                                en.mEnEnc, sizeof(en.mEnEnc));
-                TRACE2(" %8d %08x\n", ntohl(entryEnc.mSize), ntohl(entryEnc.mWeakChecksum));
-                
-        }
-        TRACE0("======== ===== ========== ======== ========\n");
+                sBlowfishDecryptBlockEntry.TransformBlock(&entryEnc,
+                        sizeof(entryEnc), en.mEnEnc, sizeof(en.mEnEnc));
+
+
+                if(s > 0)
+                {
+                        nnew++;
+                        BOX_TRACE(std::setw(8) << b << " this  s=" << 
+                                std::setw(8) << s << " " <<
+                                std::setw(8) << ntohl(entryEnc.mSize) << " " <<
+                                std::setw(8) << std::setfill('0') <<
+                                std::hex << ntohl(entryEnc.mWeakChecksum));
+                }
+                else
+                {
+                        nold++;
+                        BOX_TRACE(std::setw(8) << b << " other i=" << 
+                                std::setw(8) << (0-s) << " " <<
+                                std::setw(8) << ntohl(entryEnc.mSize) << " " <<
+                                std::setw(8) << std::setfill('0') <<
+                                std::hex << ntohl(entryEnc.mWeakChecksum));
+                }
+        }
+        BOX_TRACE("======== ===== ========== ======== ========");
         TEST_THAT(new_blocks_expected == nnew);
         TEST_THAT(old_blocks_expected == nold);

box/trunk/test/basicserver/testbasicserver.cpp

@@ -186 +186 @@
         static ConfigurationVerifyKey verifyserverkeys[] = 
         {
-                SERVERSTREAM_VERIFY_SERVER_KEYS(0)      // no default addresses
+                SERVERSTREAM_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue) // no default listen addresses
         };
 
@@ -259 +259 @@
         static ConfigurationVerifyKey verifyserverkeys[] = 
         {
-                SERVERTLS_VERIFY_SERVER_KEYS(0) // no default listen addresses
+                SERVERTLS_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue) // no default listen addresses
         };
 

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -515 +515 @@
                         // connect and log in
                         SocketStreamTLS conn;
-                        conn.Open(context, Socket::TypeINET, "localhost", BOX_PORT_BBSTORED);
+                        conn.Open(context, Socket::TypeINET, "localhost",
+                                22011);
                         BackupProtocolClient protocol(conn);
                         protocol.QueryVersion(BACKUP_STORE_SERVER_VERSION);
@@ -608 +609 @@
 {
         sSocket.Open(rContext, Socket::TypeINET, 
-                "localhost", BOX_PORT_BBSTORED);
+                "localhost", 22011);
         std::auto_ptr<BackupProtocolClient> connection;
         connection.reset(new BackupProtocolClient(sSocket));
@@ -2560 +2561 @@
                                 == Restore_TargetExists);
                         
-                        // Make sure you can't restore to a nonexistant path
-                        printf("Try to restore to a path that doesn't exist\n");
-                        TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/no-such-path/subdir", 
-                                true /* print progress dots */) 
-                                == Restore_TargetPathNotFound);
-                        
                         // Find ID of the deleted directory
                         deldirid = GetDirID(*client, "x1", restoredirid);
@@ -2578 +2572 @@
                                 true /* deleted files */) 
                                 == Restore_Complete);
+
+                        // Make sure you can't restore to a nonexistant path
+                        printf("\n\n==== Try to restore to a path "
+                                "that doesn't exist\n");
+                        fflush(stdout);
+                        TEST_THAT(BackupClientRestore(*client, restoredirid, 
+                                "testfiles/no-such-path/subdir", 
+                                true /* print progress dots */) 
+                                == Restore_TargetPathNotFound);
 
                         // Log out

box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf

@@ -9 +9 @@
 
 StoreHostname = localhost
+StorePort = 22011
 AccountNumber = 0x01234567
 

box/trunk/test/bbackupd/testfiles/bbackupd.conf.in

@@ -9 +9 @@
 
 StoreHostname = localhost
+StorePort = 22011
 AccountNumber = 0x01234567
 

box/trunk/test/bbackupd/testfiles/bbstored.conf

@@ -10 +10 @@
 {
         PidFile = testfiles/bbstored.pid
-        ListenAddresses = inet:localhost
+        ListenAddresses = inet:localhost:22011
         CertificateFile = testfiles/serverCerts.pem
         PrivateKeyFile = testfiles/serverPrivKey.pem

box/trunk/test/common/testcommon.cpp

@@ -58 +58 @@
 ConfigurationVerifyKey verifykeys1_1_1[] =
 {
-        {"bing", 0, ConfigTest_Exists, 0},
-        {"carrots", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"terrible", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("bing", ConfigTest_Exists),
+        ConfigurationVerifyKey("carrots", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("terrible", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
 ConfigurationVerifyKey verifykeys1_1_2[] =
 {
-        {"fish", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("fish", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -90 +90 @@
 ConfigurationVerifyKey verifykeys1_1[] =
 {
-        {"value", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string1", 0, ConfigTest_Exists, 0},
-        {"string2", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("value", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string1", ConfigTest_Exists),
+        ConfigurationVerifyKey("string2", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
 ConfigurationVerifyKey verifykeys1_2[] = 
 {
-        {"carrots", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("carrots", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -121 +121 @@
 ConfigurationVerifyKey verifykeys1[] =
 {
-                {"notExpected", 0, 0, 0},
-                {"HasDefaultValue", "Lovely default value", 0, 0},
-                {"MultiValue", 0, ConfigTest_MultiValueAllowed, 0},
-                {"BoolTrue1", 0, ConfigTest_IsBool, 0},
-                {"BoolTrue2", 0, ConfigTest_IsBool, 0},
-                {"BoolFalse1", 0, ConfigTest_IsBool, 0},
-                {"BoolFalse2", 0, ConfigTest_IsBool, 0},
-                {"TOPlevel", 0, ConfigTest_LastEntry | ConfigTest_Exists, 0}
+                ConfigurationVerifyKey("notExpected", 0),
+                ConfigurationVerifyKey("HasDefaultValue", 0, "Lovely default value"),
+                ConfigurationVerifyKey("MultiValue", ConfigTest_MultiValueAllowed),
+                ConfigurationVerifyKey("BoolTrue1", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolTrue2", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolFalse1", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolFalse2", ConfigTest_IsBool),
+                ConfigurationVerifyKey("TOPlevel", 
+                        ConfigTest_LastEntry | ConfigTest_Exists)
 };
 

box/trunk/test/compress/testcompress.cpp

@@ -91 +91 @@
                 // Check sizes
                 TEST_THAT(poutput->GetSize() < source.GetSize());
-                TRACE2("compressed size = %d, source size = %d\n", poutput->GetSize(), source.GetSize());
+                BOX_TRACE("compressed size = " << poutput->GetSize() <<
+                        ", source size = " << source.GetSize());
                 
                 // Decompress the data

box/trunk/test/raidfile/testraidfile.cpp

@@ -623 +623 @@
                 TEST_THAT(n1 != n3);
                 TEST_THAT(n1 == n4);            // ie wraps around
-                TRACE3("Gen paths= '%s','%s',%s'\n", n1.c_str(), n2.c_str(), n3.c_str());
+                BOX_TRACE("Gen paths = '" << n1 << "', '" << n2 << 
+                        "', '" << n3);
         }