From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 15 Oct 2015 06:43:51 +0000 (+0200)
Subject: [master] Merge branch 'trac3975'
X-Git-Tag: trac3874_base~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bd8891c0b9cb7dc504fa69251610996775cefbf;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3975'
---

3bd8891c0b9cb7dc504fa69251610996775cefbf
diff --cc src/bin/admin/scripts/mysql/.gitignore
index e9a483d6fc,e9a483d6fc..3743da9a2d
--- a/src/bin/admin/scripts/mysql/.gitignore
+++ b/src/bin/admin/scripts/mysql/.gitignore
@@@ -1,2 -1,2 +1,3 @@@
  /upgrade_1.0_to_2.0.sh
  /upgrade_2.0_to_3.0.sh
++/upgrade_3.0_to_4.0.sh
diff --cc src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
index 655adddbb1,e10b5d8c3f..57a1ef324d
--- a/src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
@@@ -1298,27 -1334,13 +1349,34 @@@ TEST_F(ExpirationAllocEngine6Test, recl
      testReclaimExpiredLeasesTimeout(1);
  }
  
+ // This test verifies that expired-reclaimed leases are removed from the
+ // lease database.
+ TEST_F(ExpirationAllocEngine6Test, deleteExpiredReclaimedLeases) {
+     BOOST_STATIC_ASSERT(TEST_LEASES_NUM >= 10);
+     testDeleteExpiredReclaimedLeases();
+ }
+ 
 +/// This test verifies that @ref AllocEngine::reclaimExpiredLeases6 properly
 +/// handles declined leases that have expired in case when it is told to
- /// remove leases.
++/// remove leases.}
 +TEST_F(ExpirationAllocEngine6Test, reclaimDeclined1) {
 +    testReclaimDeclined(true);
 +}
 +
 +/// This test verifies that @ref AllocEngine::reclaimExpiredLeases6 properly
 +/// handles declined leases that have expired in case when it is told to
 +/// not remove leases. This flag should not matter and declined expired
 +/// leases should always be removed.
 +TEST_F(ExpirationAllocEngine6Test, reclaimDeclined2) {
 +    testReclaimDeclined(false);
 +}
 +
 +/// This test verifies that statistics are modified correctly after
 +/// reclaim expired leases is called.
 +TEST_F(ExpirationAllocEngine6Test, reclaimDeclinedStats) {
 +    testReclaimDeclinedStats("assigned-nas");
 +}
 +
  // *******************************************************
  //
  // DHCPv4 lease reclamation routine tests start here!