From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 22 Jun 2017 10:10:53 +0000 (+0200)
Subject: [master] Apply the fix which was accidentally omitted during merge.
X-Git-Tag: trac5286_base~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2239587220b307b3f448e4b6091bb4a39840141;p=thirdparty%2Fkea.git

[master] Apply the fix which was accidentally omitted during merge.

Commiting on my discretion as this is trivial fix.
---

diff --git a/src/bin/agent/tests/ca_command_mgr_unittests.cc b/src/bin/agent/tests/ca_command_mgr_unittests.cc
index 6d1890eb5a..45ebc5131f 100644
--- a/src/bin/agent/tests/ca_command_mgr_unittests.cc
+++ b/src/bin/agent/tests/ca_command_mgr_unittests.cc
@@ -328,7 +328,7 @@ TEST_F(CtrlAgentCommandMgrTest, invalidAnswer) {
 /// timeout value. It is hardcoded to 5 sec, which is too long for the
 /// unit test to run.
 TEST_F(CtrlAgentCommandMgrTest, DISABLED_connectionTimeout) {
-    testForward(CtrlAgentCfgContext::TYPE_DHCP6, "dhcp6",
+    testForward("dhcp6", "dhcp6",
                 isc::config::CONTROL_RESULT_ERROR, -1, -1, 1,
                 "{ \"result\": 0");
 }