Merge branch '20522-load-dispatch-priv-key'

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

diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index fb9792632c5193576d0d9f52d65c09208196928e..9a041790864d6c22b1ac7eadf79e8c6dbe9325fa 100644 (file)
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -407,7 +407,7 @@ Clusters:
                if v != nil {
                        c.Logf("%#v", v.Clusters)
                }
-               c.Check(err, check.ErrorMatches, `.*cluster ID should be 5 alphanumeric characters.*`)
+               c.Check(err, check.ErrorMatches, `.*cluster ID should be 5 lowercase alphanumeric characters.*`)
        }
 }
 
@@ -912,3 +912,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)
+}