Skip to content

Commit 92140fa

Browse files
Merge branch 'v8' into add-droplet-lifecycle-information-v8
2 parents 45fe968 + 9c2b5a2 commit 92140fa

File tree

11 files changed

+132
-31
lines changed

11 files changed

+132
-31
lines changed

.github/workflows/tests-integration-reusable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
env:
2020
ENV_NAME: ${{ inputs.env-name }}
2121
NODES: 12
22-
FLAKE_ATTEMPTS: ${{ vars.TEST_FLAKE_ATTEMPTS || '4' }}
22+
FLAKE_ATTEMPTS: ${{ vars.TEST_FLAKE_ATTEMPTS || '5' }}
2323
BBL_CLI_VERSION: ${{ vars.BBL_CLI_VERSION }}
2424
BOSH_CLI_VERSION: ${{ vars.BOSH_CLI_VERSION }}
2525
CREDHUB_CLI_VERSION: ${{ vars.CREDHUB_CLI_VERSION }}

.github/workflows/tests-integration.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@ jobs:
120120
needs:
121121
- get-sha
122122
- set-env-name
123+
- run-integration-tests-cf-env
123124
if: ${{
124125
always() &&
125126
needs.set-env-name.result == 'success' &&
126127
(github.event_name != 'workflow_dispatch' || inputs.workflow == 'all' ||
127-
inputs.workflow == 'run-integration-tests-cf-env-with-client-creds') }}
128+
inputs.workflow == 'run-integration-tests-cf-env-with-client-creds') &&
129+
needs.run-integration-tests-cf-env.result != 'failure' }}
128130
uses: ./.github/workflows/tests-integration-reusable.yml
129131
with:
130132
name: Integration client creds

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
CF_DIAL_TIMEOUT ?= 15
22
NODES ?= 10
33
FLAKE_ATTEMPTS ?=5
4+
GINKGO_SUITE_TIMEOUT=2h
45
PACKAGES ?= api actor command types util version integration/helpers
56
LC_ALL = "en_US.UTF-8"
67

@@ -20,7 +21,7 @@ UNAME_S := $(shell uname -s)
2021
POLL_PROGRESS_THRESHOLD=120s
2122

2223
GINKGO_FLAGS ?= -r -randomize-all -require-suite
23-
GINKGO_INT_FLAGS = $(GINKGO_FLAGS) --poll-progress-after $(POLL_PROGRESS_THRESHOLD) -flake-attempts $(FLAKE_ATTEMPTS)
24+
GINKGO_INT_FLAGS = $(GINKGO_FLAGS) --poll-progress-after $(POLL_PROGRESS_THRESHOLD) -flake-attempts $(FLAKE_ATTEMPTS) --timeout $(GINKGO_SUITE_TIMEOUT)
2425
ginkgo_int = ginkgo $(GINKGO_INT_FLAGS)
2526

2627
GINKGO_UNITS_FLAGS = $(GINKGO_FLAGS) -randomize-suites
@@ -227,4 +228,4 @@ version: ## Print the version number of what would be built
227228
.PHONY: help
228229

229230
help:
230-
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-34s\033[0m %s\n", $$1, $$2}'
231+
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-34s\033[0m %s\n", $$1, $$2}'

bin/cleanup-integration

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ cf orgs | grep -i -e ^integration-org -e CATS- | xargs_func cf delete-org -f
5656
cf delete-org -f temp-org
5757

5858
cf buildpacks | awk '/INTEGRATION-BUILDPACK/ { if(NF >= 6) { printf("cf delete-buildpack -f %s -s %s\n", $2, $3); } else { printf("cf delete-buildpack -f %s\n", $2); }}' | bash
59+
cf buildpacks | awk '/INTEGRATION-BUILDPACK/ { printf("cf delete-buildpack -f %s\n", $2); }' | bash
5960

6061
for stack in $(cf stacks | awk '/INTEGRATION-STACK/ { print $1 }'); do
6162
echo Deleting $stack

integration/assets/hydrabroker/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module code.cloudfoundry.org/cli/integration/assets/hydrabroker
22

3-
go 1.24.0
3+
go 1.25
44

5-
toolchain go1.24.10
5+
toolchain go1.25.4
66

77
require (
88
github.com/go-playground/validator/v10 v10.8.0
@@ -25,11 +25,11 @@ require (
2525
github.com/leodido/go-urn v1.2.1 // indirect
2626
github.com/pkg/errors v0.9.1 // indirect
2727
go.yaml.in/yaml/v3 v3.0.4 // indirect
28-
golang.org/x/crypto v0.41.0 // indirect
29-
golang.org/x/mod v0.27.0 // indirect
30-
golang.org/x/net v0.43.0 // indirect
31-
golang.org/x/sync v0.16.0 // indirect
32-
golang.org/x/sys v0.35.0 // indirect
33-
golang.org/x/text v0.28.0 // indirect
34-
golang.org/x/tools v0.36.0 // indirect
28+
golang.org/x/crypto v0.45.0 // indirect
29+
golang.org/x/mod v0.29.0 // indirect
30+
golang.org/x/net v0.47.0 // indirect
31+
golang.org/x/sync v0.18.0 // indirect
32+
golang.org/x/sys v0.38.0 // indirect
33+
golang.org/x/text v0.31.0 // indirect
34+
golang.org/x/tools v0.38.0 // indirect
3535
)

integration/assets/hydrabroker/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,45 +105,45 @@ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
105105
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
106106
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
107107
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
108-
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
109-
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
108+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
109+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
110110
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
111-
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
112-
golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
111+
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
112+
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
113113
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
114114
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
115115
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
116116
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
117117
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
118118
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
119119
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
120-
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
121-
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
120+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
121+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
122122
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
123123
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
124-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
125-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
124+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
125+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
126126
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
127127
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
128128
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
129129
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
130130
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
131131
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
132132
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
133-
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
134-
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
133+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
134+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
135135
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
136136
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
137137
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
138138
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
139139
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
140-
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
141-
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
140+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
141+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
142142
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
143143
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
144144
golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
145-
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
146-
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
145+
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
146+
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
147147
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
148148
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
149149
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=

integration/helpers/version.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ func (v UAAVersion) Version() string {
4343
func IsUAAVersionAtLeast(minVersion string) bool {
4444
info := fetchAPIVersion()
4545
uaaUrl := fmt.Sprintf("%s/info", info.Links.UAA.Href)
46-
tr := &http.Transport{
47-
TLSClientConfig: &tls.Config{InsecureSkipVerify: SkipSSLValidation()},
48-
}
46+
tr := http.DefaultTransport.(*http.Transport).Clone()
47+
tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: SkipSSLValidation()}
4948
req, err := http.NewRequest("GET", uaaUrl, nil)
5049
Expect(err).ToNot(HaveOccurred())
5150
req.Header.Add("Accept", "application/json")

integration/v7/global/create_buildpack_command_test.go

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ var _ = Describe("create buildpack command", func() {
6666
AfterEach(func() {
6767
err := os.RemoveAll(buildpackDir)
6868
Expect(err).ToNot(HaveOccurred())
69+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
6970
})
7071

7172
When("zipping the directory errors", func() {
@@ -126,6 +127,10 @@ var _ = Describe("create buildpack command", func() {
126127
})
127128

128129
When("specifying a valid path", func() {
130+
AfterEach(func() {
131+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
132+
})
133+
129134
When("the new buildpack is unique", func() {
130135
When("the new buildpack has a nil stack", func() {
131136
It("successfully uploads a buildpack", func() {
@@ -146,6 +151,10 @@ var _ = Describe("create buildpack command", func() {
146151
})
147152

148153
When("the new buildpack has a valid stack", func() {
154+
AfterEach(func() {
155+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[0], "-f")).Should(Exit(0))
156+
})
157+
149158
It("successfully uploads a buildpack", func() {
150159
helpers.BuildpackWithStack(func(buildpackPath string) {
151160
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1")
@@ -166,6 +175,10 @@ var _ = Describe("create buildpack command", func() {
166175
})
167176

168177
When("the new buildpack has an invalid stack", func() {
178+
AfterEach(func() {
179+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[0], "-f")).Should(Exit(0))
180+
})
181+
169182
It("returns the appropriate error", func() {
170183
helpers.BuildpackWithStack(func(buildpackPath string) {
171184
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1")
@@ -196,6 +209,10 @@ var _ = Describe("create buildpack command", func() {
196209
}, stacks[0])
197210
})
198211

212+
AfterEach(func() {
213+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[0], "-f")).Should(Exit(0))
214+
})
215+
199216
It("prints a warning and exits with an error", func() {
200217
helpers.BuildpackWithStack(func(buildpackPath string) {
201218
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1")
@@ -218,6 +235,10 @@ var _ = Describe("create buildpack command", func() {
218235
})
219236
})
220237

238+
AfterEach(func() {
239+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
240+
})
241+
221242
It("prints a warning and exits with an error", func() {
222243
helpers.BuildpackWithoutStack(func(buildpackPath string) {
223244
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1")
@@ -238,6 +259,11 @@ var _ = Describe("create buildpack command", func() {
238259
}, stacks[1])
239260
})
240261

262+
AfterEach(func() {
263+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[0], "-f")).Should(Exit(0))
264+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[1], "-f")).Should(Exit(0))
265+
})
266+
241267
It("successfully uploads a buildpack", func() {
242268
helpers.BuildpackWithStack(func(buildpackPath string) {
243269
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1")
@@ -265,6 +291,10 @@ var _ = Describe("create buildpack command", func() {
265291
})
266292
})
267293

294+
AfterEach(func() {
295+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
296+
})
297+
268298
It("prints a warning and tip, then exits with an error", func() {
269299
helpers.BuildpackWithStack(func(buildpackPath string) {
270300
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1")
@@ -283,6 +313,10 @@ var _ = Describe("create buildpack command", func() {
283313
}, stacks[0])
284314
})
285315

316+
AfterEach(func() {
317+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[0], "-f")).Should(Exit(0))
318+
})
319+
286320
It("prints a warning then exits with an error", func() {
287321
helpers.BuildpackWithStack(func(buildpackPath string) {
288322
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1")
@@ -305,6 +339,10 @@ var _ = Describe("create buildpack command", func() {
305339
When("specifying a valid path", func() {
306340
When("the new buildpack is unique", func() {
307341
When("the new buildpack has a nil stack", func() {
342+
AfterEach(func() {
343+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
344+
})
345+
308346
It("successfully uploads a buildpack", func() {
309347
helpers.CNB(func(buildpackPath string) {
310348
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1", "--lifecycle=cnb")
@@ -344,6 +382,10 @@ var _ = Describe("create buildpack command", func() {
344382
buildpackURL = "https://github.com/cloudfoundry/binary-buildpack/releases/download/v1.0.21/binary-buildpack-v1.0.21.zip"
345383
})
346384

385+
AfterEach(func() {
386+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
387+
})
388+
347389
It("successfully uploads a buildpack", func() {
348390
session := helpers.CF("create-buildpack", buildpackName, buildpackURL, "1")
349391
Eventually(session).Should(Say(`Creating buildpack %s as %s\.\.\.`, buildpackName, username))
@@ -400,6 +442,10 @@ var _ = Describe("create buildpack command", func() {
400442

401443
When("specifying the position flag", func() {
402444
When("position is positive integer", func() {
445+
AfterEach(func() {
446+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
447+
})
448+
403449
It("successfully uploads buildpack in correct position", func() {
404450
helpers.BuildpackWithoutStack(func(buildpackPath string) {
405451
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "3")
@@ -420,6 +466,10 @@ var _ = Describe("create buildpack command", func() {
420466
})
421467

422468
When("specifying disable flag", func() {
469+
AfterEach(func() {
470+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
471+
})
472+
423473
It("disables buildpack", func() {
424474
helpers.BuildpackWithoutStack(func(buildpackPath string) {
425475
session := helpers.CF("create-buildpack", buildpackName, buildpackPath, "1", "--disable")

integration/v7/global/delete_buildpack_command_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ var _ = Describe("delete-buildpack command", func() {
145145
}, stacks[1])
146146
})
147147

148+
AfterEach(func() {
149+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[0], "-f")).Should(Exit(0))
150+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[1], "-f")).Should(Exit(0))
151+
})
152+
148153
It("properly handles ambiguity", func() {
149154
By("failing when no stack specified")
150155

@@ -186,6 +191,10 @@ var _ = Describe("delete-buildpack command", func() {
186191
Eventually(session).Should(Exit(0))
187192
})
188193
})
194+
AfterEach(func() {
195+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-s", stacks[0], "-f")).Should(Exit(0))
196+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
197+
})
189198

190199
It("properly handles ambiguity", func() {
191200
By("deleting the nil stack buildpack when no stack specified")
@@ -213,6 +222,10 @@ var _ = Describe("delete-buildpack command", func() {
213222
})
214223
})
215224

225+
AfterEach(func() {
226+
Eventually(helpers.CF("delete-buildpack", buildpackName, "-f")).Should(Exit(0))
227+
})
228+
216229
When("the user enters 'y'", func() {
217230
BeforeEach(func() {
218231
_, err := buffer.Write([]byte("y\n"))

0 commit comments

Comments
 (0)