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

fqdn: Fix missing IsNil checks in unit tests #11953

Merged
merged 1 commit into from Jun 8, 2020

Conversation

pchaigno
Copy link
Member

@pchaigno pchaigno commented Jun 8, 2020

Fixes: #11943
Fixes: #9587

The same error is also present in v1.7 and v1.6 (#9587 was backported), but I'm not sure it's worth backporting to either.

Fixes: 1121202 ("fqdn: L3-aware L7 DNS policy enforcement")
Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno pchaigno added area/CI Continuous Integration testing issue or flake release-note/misc This PR makes changes that have no direct user impact. ci/flake This is a known failure that occurs in the tree. Please investigate me! needs-backport/1.8 labels Jun 8, 2020
@pchaigno pchaigno requested a review from a team June 8, 2020 12:10
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Jun 8, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.0 Jun 8, 2020
@pchaigno
Copy link
Member Author

pchaigno commented Jun 8, 2020

test-me-please

@pchaigno pchaigno added this to In Progress (Cilium) in CI Force Jun 8, 2020
@pchaigno
Copy link
Member Author

pchaigno commented Jun 8, 2020

test-focus RuntimePrivilegedUnitTests

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 37.022% when pulling 986e51e on pr/pchaigno/fix-panic-dnsproxy-test into 651a3a8 on master.

@pchaigno
Copy link
Member Author

pchaigno commented Jun 8, 2020

Runtime-4.9 passed so marking as ready to merge.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 8, 2020
@tgraf tgraf merged commit a7cddb0 into master Jun 8, 2020
1.8.0 automation moved this from In progress to Merged Jun 8, 2020
CI Force automation moved this from In Progress (Cilium) to Fixed / Done Jun 8, 2020
@tgraf tgraf deleted the pr/pchaigno/fix-panic-dnsproxy-test branch June 8, 2020 15:10
@@ -325,12 +325,14 @@ func (s *DNSProxyTestSuite) TestRejectNonMatchingRefusedResponse(c *C) {

// reject a query with NXDomain
s.proxy.SetRejectReply(option.FQDNProxyDenyWithNameError)
response, _, _ := s.dnsTCPClient.Exchange(request, s.proxy.TCPServer.Listener.Addr().String())
response, _, err := s.dnsTCPClient.Exchange(request, s.proxy.TCPServer.Listener.Addr().String())
c.Assert(err, IsNil, Commentf("DNS request from test client failed when it should succeed"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL: I didn't know you can pass Commentf to customize the assertion failure :)

@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.0 Jun 9, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.0 Jun 9, 2020
@aanm aanm mentioned this pull request Jun 9, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.0 Jun 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake ci/flake This is a known failure that occurs in the tree. Please investigate me! ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.8.0
  
Merged
1.8.0
Backport done to v1.8
CI Force
  
Fixed / Done
Development

Successfully merging this pull request may close these issues.

CI: RuntimePrivilegedUnitTests: Panic in DNSProxyTestSuite
6 participants