Skip to content
This repository was archived by the owner on Dec 5, 2018. It is now read-only.

Commit 014198e

Browse files
author
backup-restore-team-bot
committed
Merge branch 'release/v3.1.7'
2 parents 6eef341 + b19e5fe commit 014198e

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

glide.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import:
44
- package: github.com/codegangsta/cli
55
- package: github.com/hashicorp/go-plugin
66
- package: github.com/pivotalservices/cfbackup
7-
version: v0.1.157
7+
version: v0.1.158
88
subpackages:
99
- tiles
1010
- tiles/opsmanager

integration/cmd_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ func basicAuthDirectorHandlers(directorURL string) []http.HandlerFunc {
107107
ghttp.VerifyRequest("GET", "/tasks/2"),
108108
ghttp.RespondWith(http.StatusOK, getTaskResponseOK("2")),
109109
),
110+
ghttp.CombineHandlers(
111+
ghttp.VerifyRequest("GET", "/info"),
112+
ghttp.RespondWith(http.StatusOK, infoResponse),
113+
),
110114
ghttp.CombineHandlers(
111115
ghttp.VerifyRequest("PUT", "/deployments/cf-f21eea2dbdb8555f89fb/jobs/cloud_controller-partition-7bc61fd2fa9d654696df/0", "state=started"),
112116
ghttp.VerifyBody([]byte(``)),
@@ -183,6 +187,15 @@ func uaaAuthDirectorHandlers(directorURL string) []http.HandlerFunc {
183187
ghttp.VerifyRequest("GET", "/tasks/2"),
184188
ghttp.RespondWith(http.StatusOK, getTaskResponseOK("2")),
185189
),
190+
ghttp.CombineHandlers(
191+
ghttp.VerifyRequest("GET", "/info"),
192+
ghttp.RespondWith(http.StatusOK, infoResponse),
193+
),
194+
ghttp.CombineHandlers(
195+
ghttp.VerifyRequest("POST", "/oauth/token"),
196+
ghttp.RespondWith(http.StatusOK, tokenResponse, http.Header{
197+
"Content-Type": []string{"application/json"}}),
198+
),
186199
ghttp.CombineHandlers(
187200
ghttp.VerifyRequest("PUT", "/deployments/cf-f21eea2dbdb8555f89fb/jobs/cloud_controller-partition-7bc61fd2fa9d654696df/0", "state=started"),
188201
ghttp.VerifyBody([]byte(``)),

wercker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ deploy:
7878

7979
- wercker/add-to-known_hosts@1.4.0:
8080
hostname: github.com
81-
fingerprint: 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48
81+
fingerprint: SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8
8282

8383
- script:
8484
name: set release id variable for version

0 commit comments

Comments
 (0)