Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates the supply test to use different buildpack #1040

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions fixtures/supply/dotnet_app/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ public void Configure(IApplicationBuilder app)
{
app.Run(context =>
{
var bosh2 = new Process();
bosh2.StartInfo.FileName = "bosh2";
bosh2.StartInfo.Arguments = "--version";
bosh2.StartInfo.RedirectStandardOutput = true;
bosh2.Start();
var go = new Process();
go.StartInfo.FileName = "go";
go.StartInfo.Arguments = "version";
go.StartInfo.RedirectStandardOutput = true;
go.Start();

var output = bosh2.StandardOutput.ReadToEnd();
bosh2.WaitForExit();
return context.Response.WriteAsync("bosh2: " + output);
var output = go.StandardOutput.ReadToEnd();
go.WaitForExit();
return context.Response.WriteAsync("go: " + output);
});
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/dotnetcore/integration/supply_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ func testSupply(t *testing.T, context spec.G, it spec.S) {
it.Before(func() {
app = cutlass.New(filepath.Join(settings.FixturesPath, "supply", "dotnet_app"))
app.Buildpacks = []string{
"https://buildpacks.cloudfoundry.org/fixtures/new_supply_bosh2.zip",
"https://github.com/cloudfoundry/go-buildpack/#master",
"dotnet_core_buildpack",
}
})

it("finds the supplied dependency in the runtime container", func() {
PushAppAndConfirm(t, app)
Expect(app.Stdout.String()).To(ContainSubstring("SUPPLYING BOSH2"))
Expect(app.GetBody("/")).To(MatchRegexp("bosh2: version 2.0.1-74fad57"))
Expect(app.Stdout.String()).To(ContainSubstring("Installing go"))
Expect(app.GetBody("/")).To(MatchRegexp("go: go version go\\d+.\\d+.\\d+ linux/amd64"))
})
})
})
Expand Down
Loading