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.

Sign up for GitHub

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

Jump to bottom

test.cli_network_test: fix TestNetworkDefault failure on Ubuntu #2170

Merged
merged 1 commit into from
Aug 29, 2018
Merged

test.cli_network_test: fix TestNetworkDefault failure on Ubuntu #2170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions test/cli_network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,13 @@ func (suite *PouchNetworkSuite) TestNetworkDefault(c *check.C) {
}
{
cmd := "ip r |grep default"
// The command output of "ip r | grep default" contains extra "proto static"
// on Ubuntu host, which is inconsistent with output in container
routeOnHost := icmd.RunCommand("bash", "-c", cmd).Stdout()
if strings.Contains(routeOnHost, "proto static") {
// keep command output consistent between Ubuntu host and container
routeOnHost = strings.Replace(routeOnHost, " proto static ", "", -1)
}
// Assign the host network to a container.
expct := icmd.Expected{
ExitCode: 0,
Expand Down