18679: if a config file contains a key with a null value, do not

[arvados.git] / lib / config / load_test.go

diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index d4896c39cb19c2aa782a36389d9d92af728f04f5..1ede805b0085a668b40169af458243a304c12e93 100644 (file)
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -71,6 +71,18 @@ func (s *LoadSuite) TestNoConfigs(c *check.C) {
        c.Check(cc.API.MaxItemsPerResponse, check.Equals, 1000)
 }
 
+func (s *LoadSuite) TestNullKeyDoesNotOverrideDefault(c *check.C) {
+       ldr := testLoader(c, `{"Clusters":{"z1111":{"API":}}}`, nil)
+       ldr.SkipDeprecated = true
+       cfg, err := ldr.Load()
+       c.Assert(err, check.IsNil)
+       c1, err := cfg.GetCluster("z1111")
+       c.Assert(err, check.IsNil)
+       c.Check(c1.ClusterID, check.Equals, "z1111")
+       c.Check(c1.API.MaxRequestAmplification, check.Equals, 4)
+       c.Check(c1.API.MaxItemsPerResponse, check.Equals, 1000)
+}
+
 func (s *LoadSuite) TestMungeLegacyConfigArgs(c *check.C) {
        f, err := ioutil.TempFile("", "")
        c.Check(err, check.IsNil)