Merge branch '21535-multi-wf-delete'

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

diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index a19400c191df1db7a36e9e1ad8d242a0cbb301cc..75efc6a35aa67f103a33fbdd4eee2751df1da294 100644 (file)
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -19,10 +19,10 @@ import (
        "time"
 
        "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvadostest"
        "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "github.com/ghodss/yaml"
        "github.com/prometheus/client_golang/prometheus"
-       "github.com/prometheus/common/expfmt"
        "github.com/sirupsen/logrus"
        "golang.org/x/sys/unix"
        check "gopkg.in/check.v1"
@@ -882,15 +882,10 @@ func (s *LoadSuite) TestSourceTimestamp(c *check.C) {
                c.Check(int(cfg.SourceTimestamp.Sub(trial.expectTime).Seconds()), check.Equals, 0)
                c.Check(int(ldr.loadTimestamp.Sub(time.Now()).Seconds()), check.Equals, 0)
 
-               var buf bytes.Buffer
                reg := prometheus.NewRegistry()
                ldr.RegisterMetrics(reg)
-               enc := expfmt.NewEncoder(&buf, expfmt.FmtText)
-               got, _ := reg.Gather()
-               for _, mf := range got {
-                       enc.Encode(mf)
-               }
-               c.Check(buf.String(), check.Matches, `# HELP .*
+               metrics := arvadostest.GatherMetricsAsString(reg)
+               c.Check(metrics, check.Matches, `# HELP .*
 # TYPE .*
 arvados_config_load_timestamp_seconds{sha256="83aea5d82eb1d53372cd65c936c60acc1c6ef946e61977bbca7cfea709d201a8"} \Q`+fmt.Sprintf("%g", float64(ldr.loadTimestamp.UnixNano())/1e9)+`\E
 # HELP .*
@@ -912,3 +907,10 @@ func (s *LoadSuite) TestGetFilesystemSize(c *check.C) {
        c.Check(err, check.IsNil)
        c.Logf("getFilesystemSize(%q) == %v", path, size)
 }
+
+func (s *LoadSuite) TestLoadSSHKey(c *check.C) {
+       cwd, err := os.Getwd()
+       c.Assert(err, check.IsNil)
+       _, err = LoadSSHKey("file://" + cwd + "/../dispatchcloud/test/sshkey_dispatch")
+       c.Check(err, check.IsNil)
+}