From 7b1c39ceeef599d182f2bd74e17f64039e3adf3d Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Tue, 30 Jun 2015 09:20:38 +0300 Subject: [PATCH] Add tests for direct backend command --- modules/remotebackend/regression-tests/backend.rb | 4 ++++ .../remotebackend/regression-tests/direct-command/command | 3 +++ .../regression-tests/direct-command/description | 1 + .../regression-tests/direct-command/expected_result | 2 ++ modules/remotebackend/test-remotebackend.cc | 5 +++++ modules/remotebackend/unittest.rb | 4 ++++ 6 files changed, 19 insertions(+) create mode 100755 modules/remotebackend/regression-tests/direct-command/command create mode 100644 modules/remotebackend/regression-tests/direct-command/description create mode 100644 modules/remotebackend/regression-tests/direct-command/expected_result diff --git a/modules/remotebackend/regression-tests/backend.rb b/modules/remotebackend/regression-tests/backend.rb index d221a7edb65ca..19e4ad07f0d11 100755 --- a/modules/remotebackend/regression-tests/backend.rb +++ b/modules/remotebackend/regression-tests/backend.rb @@ -205,4 +205,8 @@ def do_setdomainmetadata(args) end return true end + + def do_directbackendcmd(args) + return [args["query"]] + end end diff --git a/modules/remotebackend/regression-tests/direct-command/command b/modules/remotebackend/regression-tests/direct-command/command new file mode 100755 index 0000000000000..bb610dfd726a3 --- /dev/null +++ b/modules/remotebackend/regression-tests/direct-command/command @@ -0,0 +1,3 @@ +#!/bin/sh + +../pdns/pdnssec --config-name=remote --config-dir=. backend-cmd remote HELLO diff --git a/modules/remotebackend/regression-tests/direct-command/description b/modules/remotebackend/regression-tests/direct-command/description new file mode 100644 index 0000000000000..3a8774452fb9b --- /dev/null +++ b/modules/remotebackend/regression-tests/direct-command/description @@ -0,0 +1 @@ +Tests that direct backend command works diff --git a/modules/remotebackend/regression-tests/direct-command/expected_result b/modules/remotebackend/regression-tests/direct-command/expected_result new file mode 100644 index 0000000000000..d49e833471f25 --- /dev/null +++ b/modules/remotebackend/regression-tests/direct-command/expected_result @@ -0,0 +1,2 @@ +== HELLO +HELLO \ No newline at end of file diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc index 596135c31b5d3..d3121f22f1aa6 100644 --- a/modules/remotebackend/test-remotebackend.cc +++ b/modules/remotebackend/test-remotebackend.cc @@ -296,4 +296,9 @@ BOOST_AUTO_TEST_CASE(test_method_calculateSOASerial) { BOOST_CHECK_EQUAL(serial, 2013060300); } +BOOST_AUTO_TEST_CASE(test_method_directBackendCmd) { + BOOST_TEST_MESSAGE("Testing directBackendCmd method"); + BOOST_CHECK_EQUAL(be->directBackendCmd("PING 1234"), "PING 1234"); +} + BOOST_AUTO_TEST_SUITE_END(); diff --git a/modules/remotebackend/unittest.rb b/modules/remotebackend/unittest.rb index 9bc29dd976c49..ba14c98cafe10 100644 --- a/modules/remotebackend/unittest.rb +++ b/modules/remotebackend/unittest.rb @@ -249,5 +249,9 @@ def do_calculatesoaserial(args) return [2013060300] if args["sd"]["qname"] == "unit.test" [false] end + + def do_directbackendcmd(args) + [args["query"]] + end end