Skip to content

Commit

Permalink
avoid staticfile buildpack in droplet and quota baras
Browse files Browse the repository at this point in the history
- droplet tests still don't pass on k8s because we haven't done the work
  cloudfoundry/capi-k8s-release#78

[#175173096]

Co-authored-by: Connor Braa <[email protected]>
Co-authored-by: Nat Bennett <[email protected]>
  • Loading branch information
cwlbraa and njbennett committed Oct 8, 2020
1 parent aa35c1e commit 4dc6165
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
10 changes: 5 additions & 5 deletions baras/droplets.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
. "github.com/onsi/gomega/gexec"
)

var _ = Describe("Droplets", func() {
SkipOnK8s("test uses staticfile_buildpack")
var _ = Describe("Droplet upload and download", func() {
SkipOnK8s("droplet upload and download is not supported on k8s")
var (
appGUID string
appName string
Expand All @@ -42,8 +42,8 @@ var _ = Describe("Droplets", func() {
appName2 := random_name.BARARandomName("APP2")
Expect(cf.Cf("push",
appName,
"-b", "staticfile_buildpack",
"-p", assets.NewAssets().Staticfile,
"-b", Config.GetGoBuildpackName(),
"-p", assets.NewAssets().CatnipZip,
).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))

Expect(cf.Cf("download-droplet",
Expand All @@ -56,7 +56,7 @@ var _ = Describe("Droplets", func() {
"--droplet", "/tmp/app.tgz",
).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))

Eventually(helpers.CurlAppRoot(Config, appName2)).Should(Equal("Hello from a staticfile"))
Eventually(helpers.CurlAppRoot(Config, appName2)).Should(Equal("Catnip?"))
})

It("The app successfully runs with a user uploaded droplet", func() {
Expand Down
7 changes: 3 additions & 4 deletions baras/quotas.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
)

var _ = Describe("Quotas", func() {
SkipOnK8s("uses staticfile_buildpack")
var (
spaceName string
spaceGUID string
Expand Down Expand Up @@ -48,15 +47,15 @@ var _ = Describe("Quotas", func() {
appName = random_name.BARARandomName("APP")
Expect(cf.Cf("push",
appName,
"-b", "staticfile_buildpack",
"-p", assets.NewAssets().Staticfile,
"-b", Config.GetGoBuildpackName(),
"-p", assets.NewAssets().CatnipZip,
).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))

session = cf.Cf("app", appName, "--guid")
Expect(session.Wait()).To(Exit(0))
appGUID = strings.TrimSpace(string(session.Out.Contents()))

Expect(helpers.CurlAppRoot(Config, appName)).To(Equal("Hello from a staticfile"))
Expect(helpers.CurlAppRoot(Config, appName)).To(Equal("Catnip?"))
})
})

Expand Down

0 comments on commit 4dc6165

Please sign in to comment.