fixed unit tests after extracting feature/dns2 branch

Kong · Sep 2, 2016 · 42c73b0 · 42c73b0
1 parent 2b9486d
commit 42c73b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/kong/tools/dns.lua b/kong/tools/dns.lua
@@ -25,7 +25,6 @@ local setup_client = function(conf)
   local opts = {
     hosts = hosts,
     resolv_conf = nil,
-    max_resolvers = 50,
     nameservers = servers,
     retrans = 5,
     timeout = 2000,

diff --git a/spec/01-unit/02-conf_loader_spec.lua b/spec/01-unit/02-conf_loader_spec.lua
@@ -95,7 +95,7 @@ describe("Configuration loader", function()
   end)
   it("overcomes penlight's list_delim option", function()
     local conf = assert(conf_loader("spec/fixtures/to-strip.conf"))
-    assert.False(conf.dnsmasq)
+    assert.False(conf.pg_ssl)
     assert.True(conf.plugins.foobar)
     assert.True(conf.plugins["hello-world"])
   end)

diff --git a/spec/fixtures/invalid.conf b/spec/fixtures/invalid.conf
@@ -1,3 +1,3 @@
-dnsmasq = on
+pg_ssl = on
 dns_resolver = 8.8.8.8
 cassandra_repl_strategy = foo
diff --git a/spec/fixtures/to-strip.conf b/spec/fixtures/to-strip.conf
@@ -1,10 +1,14 @@
 database = cassandra # strip me
 log_level =        debug       # strip this
                                # comment too
+pg_ssl = off                     # Toggles client-server TLS connections
+                                 # between Kong and PostgreSQL.
+
+dns_resolver = 8.8.8.8
 
 custom_plugins = foobar,hello-world  # Comma-separated list of additional plugins
                                      # this node should load.
                                      # Use this property to load custom plugins
                                      # that are not bundled with Kong.
                                      # Plugins will be loaded from the
-                                     # `kong.plugins.{name}.*` namespace.
+                                     # `kong.plugins.{name}.*` namespace.