X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c8bf4dc1eef2a73b4b01501eabdc922e2a27a276..086fdccf436bb68d38f482c4e1418c1290ed7c0c:/lib/config/deprecated_test.go diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go index 595e4c9cad..e06a1f231d 100644 --- a/lib/config/deprecated_test.go +++ b/lib/config/deprecated_test.go @@ -35,7 +35,9 @@ func testLoadLegacyConfig(content []byte, mungeFlag string, c *check.C) (*arvado ldr := testLoader(c, "Clusters: {zzzzz: {}}", nil) ldr.SetupFlags(flags) args := ldr.MungeLegacyConfigArgs(ldr.Logger, []string{"-config", tmpfile.Name()}, mungeFlag) - flags.Parse(args) + err = flags.Parse(args) + c.Assert(err, check.IsNil) + c.Assert(flags.NArg(), check.Equals, 0) cfg, err := ldr.Load() if err != nil { return nil, err @@ -197,10 +199,7 @@ func (s *LoadSuite) TestLegacyKeepWebConfig(c *check.C) { c.Check(cluster.SystemRootToken, check.Equals, "abcdefg") c.Check(cluster.Collections.WebDAVCache.TTL, check.Equals, arvados.Duration(60*time.Second)) - c.Check(cluster.Collections.WebDAVCache.UUIDTTL, check.Equals, arvados.Duration(time.Second)) - c.Check(cluster.Collections.WebDAVCache.MaxCollectionEntries, check.Equals, 42) - c.Check(cluster.Collections.WebDAVCache.MaxCollectionBytes, check.Equals, int64(1234567890)) - c.Check(cluster.Collections.WebDAVCache.MaxUUIDEntries, check.Equals, 100) + c.Check(cluster.Collections.WebDAVCache.MaxCollectionBytes, check.Equals, arvados.ByteSize(1234567890)) c.Check(cluster.Services.WebDAVDownload.ExternalURL, check.Equals, arvados.URL{Host: "download.example.com", Path: "/"}) c.Check(cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: ":80"}], check.NotNil)