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

update deps (go-iptables, cni) #1083

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Conversation

danwinship
Copy link
Contributor

@danwinship danwinship commented Aug 28, 2024

Splitting this out from #935 for clarity / ease of debugging.

Closes #1068

cc @squeed

Signed-off-by: Dan Winship <[email protected]>
@@ -74,7 +74,8 @@ var _ = Describe("Loopback", func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

Eventually(session).Should(gbytes.Say(`{.*}`))
// "(?s)" turns on the "s" flag, making "." match newlines too.
Eventually(session).Should(gbytes.Say(`(?s){.*}`))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Clearly this was intended to match the result as a whole, but actually, it was only matching

"dns": {}

because that was the only place where there was a { followed by a } on the same line. And then containernetworking/cni#1039 broke that...

@mmorel-35 mmorel-35 requested a review from squeed August 29, 2024 09:31
@squeed squeed merged commit 20f31e5 into containernetworking:main Aug 29, 2024
5 checks passed
@danwinship danwinship deleted the update-deps branch August 29, 2024 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants