[ARVADOS] updated: 1.3.0-1553-g6a90dcb6b

[Git user]

Summary of changes:
 lib/config/deprecated_test.go | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

       via  6a90dcb6b421380d4654d47db9b8037643039236 (commit)
      from  72eeca4fb7abb97ae41e30c032e3d48074b915f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 6a90dcb6b421380d4654d47db9b8037643039236
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Mon Aug 26 12:35:49 2019 -0400

    14712: Adds legacy config test
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go
index 76313ebb1..5dda0ba94 100644
--- a/lib/config/deprecated_test.go
+++ b/lib/config/deprecated_test.go
@@ -187,3 +187,32 @@ func fmtKeepproxyConfig(param string, debugLog bool) string {
 }
 `, debugLog, param)
 }
+
+func (s *LoadSuite) TestLegacyArvGitHttpdConfig(c *check.C) {
+	content := []byte(`
+{
+	"Client": {
+		"Scheme": "",
+		"APIHost": "example.com",
+		"AuthToken": "abcdefg",
+	},
+	"Listen": ":9000",
+	"GitCommand": "/test/git",
+	"GitoliteHome": "/test/gitolite",
+	"RepoRoot": "/test/reporoot",
+	"ManagementToken": "xyzzy"
+}
+`)
+	f := "-legacy-git-httpd-config"
+	cluster, err := testLoadLegacyConfig(content, f, c)
+
+	c.Check(err, check.IsNil)
+	c.Check(cluster, check.NotNil)
+	c.Check(cluster.Services.Controller.ExternalURL, check.Equals, arvados.URL{Scheme: "https", Host: "example.com"})
+	c.Check(cluster.SystemRootToken, check.Equals, "abcdefg")
+	c.Check(cluster.ManagementToken, check.Equals, "xyzzy")
+	c.Check(cluster.Git.GitCommand, check.Equals, "/test/git")
+	c.Check(cluster.Git.GitoliteHome, check.Equals, "/test/gitolite")
+	c.Check(cluster.Git.Repositories, check.Equals, "/test/reporoot")
+	c.Check(cluster.Services.Keepproxy.InternalURLs[arvados.URL{Host: ":9000"}], check.Equals, arvados.ServiceInstance{})
+}

-----------------------------------------------------------------------


hooks/post-receive
--