From: Aki Tuomi <cmouse@desteem.org>
Date: Tue, 15 Jul 2014 16:02:17 +0000 (+0300)
Subject: Tests for isMaster
X-Git-Tag: auth-3.4.0-rc1~82^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f016c0ec12b9b560ea56e3ed99061a460d56f4ff;p=thirdparty%2Fpdns.git

Tests for isMaster
---

diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc
index 2e55e00fd9..599091ad2f 100644
--- a/modules/remotebackend/test-remotebackend.cc
+++ b/modules/remotebackend/test-remotebackend.cc
@@ -191,6 +191,12 @@ BOOST_AUTO_TEST_CASE(test_method_getDomainInfo) {
    BOOST_CHECK_EQUAL(di.backend, be);
 }
 
+BOOST_AUTO_TEST_CASE(test_method_isMaster) {
+   BOOST_TEST_MESSAGE("Testing isMaster method");
+   BOOST_CHECK(be->isMaster("ns1.unit.test", "10.0.0.1"));
+   BOOST_CHECK(!be->isMaster("ns2.unit.test", "10.0.0.2"));
+}
+
 BOOST_AUTO_TEST_CASE(test_method_superMasterBackend) {
    DNSResourceRecord rr;
    std::vector<DNSResourceRecord> nsset; 
diff --git a/modules/remotebackend/unittest.rb b/modules/remotebackend/unittest.rb
index 734ff9e5d9..a5aac44259 100644
--- a/modules/remotebackend/unittest.rb
+++ b/modules/remotebackend/unittest.rb
@@ -27,6 +27,8 @@ $keys = {}
 
 $tsigkeys = { "test" => {:name => "test", :algorithm => "NULL", :content => "NULL"} }
 
+$masters = { :name => "ns1.unit.test", :ip => "10.0.0.1" }
+
 class Handler
    def initialize
    end
@@ -172,6 +174,10 @@ class Handler
      [false]
    end
 
+   def do_ismaster(args)
+     $masters[:name] == args["name"] && $masters[:ip] == args["ip"]
+   end
+
    def do_supermasterbackend(args) 
      $domain[args["domain"]] = {
         "NS" => args["nsset"]
diff --git a/modules/remotebackend/unittest_http.rb b/modules/remotebackend/unittest_http.rb
index 6ba013217f..99dfe0f655 100755
--- a/modules/remotebackend/unittest_http.rb
+++ b/modules/remotebackend/unittest_http.rb
@@ -75,6 +75,11 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
         {
              "id" => url.shift.to_i
         }
+     when "ismaster"
+        {
+             "name" => url.shift,
+             "ip" => url.shift
+        }
      when "supermasterbackend", "createslavedomain"
         {
              "ip" => url.shift,