diff options
author | Chris Wilson <chris+github@qwirx.com> | 2008-03-28 22:59:28 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2008-03-28 22:59:28 +0000 |
commit | 732bdbdaacb429c94c4120070e531038e3d6f132 (patch) | |
tree | ecd16d380ae1d2dcd0d65e089177eb16cca6d47f /test/common | |
parent | 4fca88ed02c1f0b5208abf2420f73023de54c23e (diff) |
Allow configuration of the server port that the client will connect to
(bbackupd and bbackupquery).
Redesign ConfigurationVerify to use classes instead of structs.
Use port 22011 instead of 2201 during tests, to reduce the chances of
conflicting with a running bbstored or other process.
Ignore autogen_* in svn:ignore everywhere instead of individual per-file
ignores.
Diffstat (limited to 'test/common')
-rw-r--r-- | test/common/testcommon.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/test/common/testcommon.cpp b/test/common/testcommon.cpp index eb057228..46d36c73 100644 --- a/test/common/testcommon.cpp +++ b/test/common/testcommon.cpp @@ -57,15 +57,15 @@ void test_conversions() 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) }; @@ -89,15 +89,15 @@ ConfigurationVerify verifysub1_1[] = 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) }; ConfigurationVerify verifysub1[] = @@ -120,14 +120,15 @@ ConfigurationVerify verifysub1[] = 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) }; ConfigurationVerify verify = |