Skip to content

Commit

Permalink
Bump the stack version for push related tests
Browse files Browse the repository at this point in the history
cf-deployment version 8+ no longer supports cflinuxfs2

[#165733811](https://www.pivotaltracker.com/story/show/165733811)

Co-authored-by: Will Murphy <wmurphy@pivotal.io>
  • Loading branch information
bwasmith and willmurphyscode committed Apr 30, 2019
1 parent babdf38 commit 5a09b7c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
13 changes: 6 additions & 7 deletions integration/v6/push/app_flags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var _ = Describe("push with various flags and no manifest", func() {
"-k", "300M",
"-i", "2",
"-m", "70M",
"-s", "cflinuxfs2",
"-s", "cflinuxfs3",
"-t", "180",
)
Eventually(session).Should(Say(`Getting app info\.\.\.`))
Expand All @@ -44,7 +44,7 @@ var _ = Describe("push with various flags and no manifest", func() {
Eventually(session).Should(Say(`\s+health check type:\s+port`))
Eventually(session).Should(Say(`\s+instances:\s+2`))
Eventually(session).Should(Say(`\s+memory:\s+70M`))
Eventually(session).Should(Say(`\s+stack:\s+cflinuxfs2`))
Eventually(session).Should(Say(`\s+stack:\s+cflinuxfs3`))
Eventually(session).Should(Say(`\s+routes:`))
Eventually(session).Should(Say(`(?i)\+\s+%s.%s`, appName, helpers.DefaultSharedDomain()))
Eventually(session).Should(Say(`Mapping routes\.\.\.`))
Expand All @@ -58,12 +58,11 @@ var _ = Describe("push with various flags and no manifest", func() {
Eventually(session).Should(Exit(0))
})

// output is different from when API version is below 3.27.0
time.Sleep(5 * time.Second)
session := helpers.CF("app", appName)
Eventually(session).Should(Say(`name:\s+%s`, appName))
Eventually(session).Should(Say(`last uploaded:\s+\w{3} \d{1,2} \w{3} \d{2}:\d{2}:\d{2} \w{3} \d{4}`))
Eventually(session).Should(Say(`stack:\s+cflinuxfs2`))
Eventually(session).Should(Say(`stack:\s+cflinuxfs3`))
Eventually(session).Should(Say(`buildpacks:\s+staticfile`))
Eventually(session).Should(Say(`type:\s+web`))
Eventually(session).Should(Say(`instances:\s+2/2`))
Expand All @@ -83,7 +82,7 @@ var _ = Describe("push with various flags and no manifest", func() {
"-k", "300M",
"-i", "2",
"-m", "70M",
"-s", "cflinuxfs2",
"-s", "cflinuxfs3",
"-t", "180",
)

Expand All @@ -98,7 +97,7 @@ var _ = Describe("push with various flags and no manifest", func() {
Eventually(session).Should(Say(`\s+health check type:\s+http`))
Eventually(session).Should(Say(`\s+instances:\s+2`))
Eventually(session).Should(Say(`\s+memory:\s+70M`))
Eventually(session).Should(Say(`\s+stack:\s+cflinuxfs`))
Eventually(session).Should(Say(`\s+stack:\s+cflinuxfs3`))
Eventually(session).Should(Say(`\s+routes:`))
Eventually(session).Should(Say(`(?i)\+\s+%s.%s`, appName, helpers.DefaultSharedDomain()))
Eventually(session).Should(Say(`Mapping routes\.\.\.`))
Expand All @@ -118,7 +117,7 @@ var _ = Describe("push with various flags and no manifest", func() {
session := helpers.CF("app", appName)
Eventually(session).Should(Say(`name:\s+%s`, appName))
Eventually(session).Should(Say(`last uploaded:\s+\w{3} \d{1,2} \w{3} \d{2}:\d{2}:\d{2} \w{3} \d{4}`))
Eventually(session).Should(Say(`stack:\s+cflinuxfs`))
Eventually(session).Should(Say(`stack:\s+cflinuxfs3`))
Eventually(session).Should(Say(`buildpacks:\s+staticfile`))
Eventually(session).Should(Say(`type:\s+web`))
Eventually(session).Should(Say(`instances:\s+2/2`))
Expand Down
6 changes: 3 additions & 3 deletions integration/v6/push/simple_manifest_only_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var _ = Describe("push with a simple manifest and no flags", func() {
},
"instances": 2,
"memory": "70M",
"stack": "cflinuxfs2",
"stack": "cflinuxfs3",
"health-check-type": "http",
"health-check-http-endpoint": "/",
"timeout": 180,
Expand All @@ -68,7 +68,7 @@ var _ = Describe("push with a simple manifest and no flags", func() {
Eventually(session).Should(Say(`\s+health check type:\s+http`))
Eventually(session).Should(Say(`\s+instances:\s+2`))
Eventually(session).Should(Say(`\s+memory:\s+70M`))
Eventually(session).Should(Say(`\s+stack:\s+cflinuxfs2`))
Eventually(session).Should(Say(`\s+stack:\s+cflinuxfs3`))
Eventually(session).Should(Say(`\s+env:`))
Eventually(session).Should(Say(`\+\s+key1`))
Eventually(session).Should(Say(`\+\s+key2`))
Expand All @@ -92,7 +92,7 @@ var _ = Describe("push with a simple manifest and no flags", func() {
session := helpers.CF("app", appName)
Eventually(session).Should(Say(`name:\s+%s`, appName))
Eventually(session).Should(Say(`last uploaded:\s+\w{3} \d{1,2} \w{3} \d{2}:\d{2}:\d{2} \w{3} \d{4}`))
Eventually(session).Should(Say(`stack:\s+cflinuxfs2`))
Eventually(session).Should(Say(`stack:\s+cflinuxfs3`))
Eventually(session).Should(Say(`buildpacks:\s+staticfile`))
Eventually(session).Should(Say(`type:\s+web`))
Eventually(session).Should(Say(`instances:\s+2/2`))
Expand Down

0 comments on commit 5a09b7c

Please sign in to comment.