Skip to content

Commit

Permalink
remove legacy functionality from integration tests
Browse files Browse the repository at this point in the history
- These are being removed because they only way to access these features
is through the plugin architecture. Even then, the current version of
push has deprecated inheritance and globals in the manifest. In addition
to changes with random-route and various routing fields.

[#154075141]
  • Loading branch information
XenoPhex committed Jan 10, 2018
1 parent f53d03a commit b6f4653
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 2,559 deletions.
10 changes: 5 additions & 5 deletions integration/isolated/app_command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,14 @@ applications:
disk_quota: 128M
routes:
- route: %s.%s
- route: %s:0
- route: %s:1024
`, appName, appName, domainName, tcpDomain.Name))
manifestPath := filepath.Join(appDir, "manifest.yml")
err := ioutil.WriteFile(manifestPath, manifestContents, 0666)
Expect(err).ToNot(HaveOccurred())

// Create manifest
Eventually(helpers.CF("push", appName, "-p", appDir, "-f", manifestPath, "-b", "staticfile_buildpack", "--random-route")).Should(Exit(0))
Eventually(helpers.CF("push", appName, "-p", appDir, "-f", manifestPath, "-b", "staticfile_buildpack")).Should(Exit(0))
})
})

Expand All @@ -135,7 +135,7 @@ applications:
Eventually(session).Should(Say("instances:\\s+2/2"))
Eventually(session).Should(Say("isolation segment:\\s+%s", RealIsolationSegment))
Eventually(session).Should(Say("usage:\\s+128M x 2 instances"))
Eventually(session).Should(Say("routes:\\s+[a-z-]+\\.%s, %s:\\d+", domainName, tcpDomain.Name))
Eventually(session).Should(Say("routes:\\s+[\\w\\d-]+\\.%s, %s:1024", domainName, tcpDomain.Name))
Eventually(session).Should(Say("last uploaded:\\s+\\w{3} [0-3]\\d \\w{3} [0-2]\\d:[0-5]\\d:[0-5]\\d \\w+ \\d{4}"))
Eventually(session).Should(Say("stack:\\s+cflinuxfs2"))
Eventually(session).Should(Say("buildpack:\\s+staticfile_buildpack"))
Expand All @@ -158,7 +158,7 @@ applications:
Eventually(session).Should(Say("requested state:\\s+stopped"))
Eventually(session).Should(Say("instances:\\s+0/2"))
Eventually(session).Should(Say("usage:\\s+128M x 2 instances"))
Eventually(session).Should(Say("routes:\\s+[a-z-]+.%s, %s:\\d+", domainName, tcpDomain.Name))
Eventually(session).Should(Say("routes:\\s+[\\w\\d-]+.%s, %s:1024", domainName, tcpDomain.Name))
Eventually(session).Should(Say("last uploaded:"))
Eventually(session).Should(Say("stack:\\s+cflinuxfs2"))
Eventually(session).Should(Say("buildpack:\\s+staticfile_buildpack"))
Expand All @@ -179,7 +179,7 @@ applications:
Eventually(session).Should(Say("requested state:\\s+started"))
Eventually(session).Should(Say("instances:\\s+0/0"))
Eventually(session).Should(Say("usage:\\s+128M x 0 instances"))
Eventually(session).Should(Say("routes:\\s+[a-z-]+\\.%s, %s:\\d+", domainName, tcpDomain.Name))
Eventually(session).Should(Say("routes:\\s+[\\w\\d-]+\\.%s, %s:1024", domainName, tcpDomain.Name))
Eventually(session).Should(Say("last uploaded:"))
Eventually(session).Should(Say("stack:\\s+cflinuxfs2"))
Eventually(session).Should(Say("buildpack:\\s+staticfile_buildpack"))
Expand Down
Loading

0 comments on commit b6f4653

Please sign in to comment.