From 4573939f8cfb063909235794c78c0cd065217ddd Mon Sep 17 00:00:00 2001 From: jackgr Date: Mon, 28 Mar 2016 18:58:05 -0700 Subject: [PATCH] Update expander test repo provider --- cmd/manager/manager/expander_test.go | 33 ++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/cmd/manager/manager/expander_test.go b/cmd/manager/manager/expander_test.go index 6f1745771..4dd9dacae 100644 --- a/cmd/manager/manager/expander_test.go +++ b/cmd/manager/manager/expander_test.go @@ -35,12 +35,16 @@ import ( ) var ( - TestRepoBucket = "kubernetes-charts-testing" - TestRepoURL = "gs://" + TestRepoBucket - TestChartName = "frobnitz" - TestChartVersion = "0.0.1" - TestArchiveName = TestChartName + "-" + TestChartVersion + ".tgz" - TestResourceType = TestRepoURL + "/" + TestArchiveName + TestRepoBucket = "kubernetes-charts-testing" + TestRepoURL = "gs://" + TestRepoBucket + TestChartName = "frobnitz" + TestChartVersion = "0.0.1" + TestArchiveName = TestChartName + "-" + TestChartVersion + ".tgz" + TestResourceType = TestRepoURL + "/" + TestArchiveName + TestRepoType = string(repo.GCSRepoType) + TestRepoFormat = string(repo.GCSRepoFormat) + TestRepoCredentialName = "default" + TestRepoName = TestRepoBucket ) var validResponseTestCaseData = []byte(` @@ -262,7 +266,7 @@ func TestExpandTemplate(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(etc.Handler)) defer ts.Close() - expander := NewExpander(ts.URL, nil) + expander := NewExpander(ts.URL, getTestRepoProvider(t)) resource := &common.Resource{ Name: "test_invocation", Type: TestResourceType, @@ -368,3 +372,18 @@ func expanderSuccessHandler(w http.ResponseWriter, r *http.Request) { svcResp := getValidServiceResponse() util.LogHandlerExitWithJSON(handler, w, svcResp, http.StatusOK) } + +func getTestRepoProvider(t *testing.T) repo.IRepoProvider { + rs := repo.NewInmemRepoService() + rp := repo.NewRepoProvider(rs, nil, nil) + tr, err := repo.NewRepo(TestRepoURL, TestRepoCredentialName, TestRepoName, TestRepoFormat, TestRepoType) + if err != nil { + t.Fatalf("cannot create test repository: %s", err) + } + + if err := rs.CreateRepo(tr); err != nil { + t.Fatalf("cannot initialize repository service: %s", err) + } + + return rp +}