[master] Merge branch 'github31'

AUTHORS

@@ -105,6 +105,7 @@ We have received the following contributions:
 
  - Patrik Lundin
    2016-07: Replace test by expr for < in configure.ac
+   2016-11: Fixes in Lease File Cleanup unit test
 
  - Michal Humpula (mihu)
    2016-07: Response to DHCPINFORM is sent to port 68

src/bin/dhcp4/tests/dhcp4_process_tests.sh.in

@@ -283,7 +283,7 @@ lfc_timer_test() {
     cleanup
     # Create a configuration with the LFC enabled, by replacing the section
     # with the lfc-interval and persist parameters.
-    LFC_CONFIG=$(printf "${CONFIG}" | sed -e 's/\"lfc-interval\": 0/\"lfc-interval\": 1/g' \
+    LFC_CONFIG=$(printf "${CONFIG}" | sed -e 's/\"lfc-interval\": 0/\"lfc-interval\": 3/g' \
                         | sed -e 's/\"persist\": false/\"persist\": true/g')
     # Create new configuration file.
     create_config "${LFC_CONFIG}"
@@ -318,7 +318,7 @@ lfc_timer_test() {
     sleep 1
 
     # Modify the interval.
-    LFC_CONFIG=$(printf "${CONFIG}" | sed -e 's/\"lfc-interval\": 1/\"lfc-interval\": 2/g')
+    LFC_CONFIG=$(printf "${LFC_CONFIG}" | sed -e 's/\"lfc-interval\": 3/\"lfc-interval\": 4/g')
     # Create new configuration file.
     create_config "${LFC_CONFIG}"
 

src/bin/dhcp6/tests/dhcp6_process_tests.sh.in

@@ -286,7 +286,7 @@ lfc_timer_test() {
     cleanup
     # Create a configuration with the LFC enabled, by replacing the section
     # with the lfc-interval and persist parameters.
-    LFC_CONFIG=$(printf "${CONFIG}" | sed -e 's/\"lfc-interval\": 0/\"lfc-interval\": 1/g' \
+    LFC_CONFIG=$(printf "${CONFIG}" | sed -e 's/\"lfc-interval\": 0/\"lfc-interval\": 3/g' \
                         | sed -e 's/\"persist\": false,/\"persist\": true,/g')
     # Create new configuration file.
     create_config "${LFC_CONFIG}"
@@ -321,7 +321,7 @@ lfc_timer_test() {
     sleep 1
 
     # Modify the interval.
-    LFC_CONFIG=$(printf "${CONFIG}" | sed -e 's/\"lfc-interval\": 1/\"lfc-interval\": 2/g')
+    LFC_CONFIG=$(printf "${LFC_CONFIG}" | sed -e 's/\"lfc-interval\": 3/\"lfc-interval\": 4/g')
     # Create new configuration file.
     create_config "${LFC_CONFIG}"