Open
Conversation
|
I still see those merge conflict markers thorughout the file, try running launch.go to catch them all. |
7a7b3d4 to
4e2bdcb
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR cleans up merge conflict artifacts in the network/benchmarks/netperf/launch.go file. The key changes include the removal of merge conflict markers and extraneous code blocks, and the consolidation of test execution logic by using the lib.TestParams configuration.
Comments suppressed due to low confidence (2)
network/benchmarks/netperf/launch.go:80
- The merge conflict markers have been removed and only the flag configuration is retained. Verify that this resolution aligns with the intended behavior and that no necessary flag configurations were inadvertently removed.
flag.BoolVar(&jsonOutput, "json", false, "Output JSON data along with CSV data")
network/benchmarks/netperf/launch.go:91
- The change in the main function removes the explicit Kubernetes client setup and test orchestration code in favor of a TestParams configuration. Please ensure that this new approach covers all required steps for test execution in your environment.
testParams := lib.TestParams{
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request addresses a small cleanup in the
network/benchmarks/netperf/launch.gofile by resolving a merge conflict artifact.