Merge branch '19954-permission-dedup-doc'

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

diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go
index 7cb169c618850a2ca5509dce24d00ee5a7a71f28..f9b1d1661b1f3c16b745c7e7c6e9304f060e2c64 100644 (file)
--- 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
@@ -185,7 +187,6 @@ func (s *LoadSuite) TestLegacyKeepWebConfig(c *check.C) {
                "UUIDTTL": "1s",
                "MaxCollectionEntries": 42,
                "MaxCollectionBytes": 1234567890,
-               "MaxPermissionEntries": 100,
                "MaxUUIDEntries": 100
        },
        "ManagementToken": "xyzzy"
@@ -198,11 +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.MaxPermissionEntries, check.Equals, 100)
-       c.Check(cluster.Collections.WebDAVCache.MaxUUIDEntries, check.Equals, 100)
 
        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)