From: Andrei Pavel <andrei.pavel@qualitance.com>
Date: Wed, 11 Jan 2017 12:42:47 +0000 (+0200)
Subject: Merge branch 'cassandra-host-data-source-stress-test' of https://github.com/andreipav... 
X-Git-Tag: trac5502_base~5^2~7^2~14^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b688eb541cd662be53bf9f761cc3136045d442cd;p=thirdparty%2Fkea.git

Merge branch 'cassandra-host-data-source-stress-test' of https://github.com/andreipavelQ/kea into cassandra-host-data-source-stress-test
---

b688eb541cd662be53bf9f761cc3136045d442cd
diff --cc src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
index a556b9959b,fa2edfa3a8..da6cd57196
--- a/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
@@@ -361,25 -344,24 +361,50 @@@ TEST(CqlOpenTest, OpenDatabase) 
      // Check that wrong specification of backend throws an exception.
      // (This is really a check on LeaseMgrFactory, but is convenient to
      // perform here.)
 -    EXPECT_THROW(LeaseMgrFactory::create(connectionString(
 -        NULL, VALID_NAME, VALID_HOST, INVALID_USER, VALID_PASSWORD)),
 +    EXPECT_THROW(
 +        LeaseMgrFactory::create(connectionString(NULL, VALID_NAME, VALID_HOST,
 +                                                 INVALID_USER, VALID_PASSWORD)),
          InvalidParameter);
 +    EXPECT_THROW(
 +        LeaseMgrFactory::create(connectionString(
 +            INVALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)),
 +        InvalidType);
 +
 +    // Check that invalid login data does not cause an exception, CQL should use
 +    // default values.
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, INVALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)));
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, VALID_NAME, INVALID_HOST, VALID_USER, VALID_PASSWORD)));
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, VALID_NAME, VALID_HOST, INVALID_USER, VALID_PASSWORD)));
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, INVALID_PASSWORD)));
+ 
++    // Check that invalid timeouts throw DbOperationError.
+     EXPECT_THROW(LeaseMgrFactory::create(connectionString(
 -        INVALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)),
 -        InvalidType);
++                     CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER,
++                     VALID_PASSWORD, INVALID_TIMEOUT_1)),
++                 DbOperationError);
++    EXPECT_THROW(LeaseMgrFactory::create(connectionString(
++                     CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER,
++                     VALID_PASSWORD, INVALID_TIMEOUT_2)),
++                 DbOperationError);
++
++    // Check that CQL allows the hostname to not be specified.
++    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
++        CQL_VALID_TYPE, NULL, VALID_HOST, INVALID_USER, VALID_PASSWORD)));
+ 
+     // Check that invalid login data does not cause an exception, CQL should use
+     // default values.
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, INVALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)));
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, VALID_NAME, INVALID_HOST, VALID_USER, VALID_PASSWORD)));
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, VALID_NAME, VALID_HOST, INVALID_USER, VALID_PASSWORD)));
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, INVALID_PASSWORD)));
  
      // Check that invalid timeouts throw DbOperationError.
      EXPECT_THROW(LeaseMgrFactory::create(connectionString(