fix(qatool): reduce generated test cases churn #1505
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| package minipipeline | ||
|
|
||
| import ( | ||
| "sort" | ||
|
|
||
| "github.com/ooni/probe-cli/v3/internal/model" | ||
| ) | ||
|
|
||
| // SortDNSLookupResults sorts and returns a copy of the DNS lookup results to avoid too-much | ||
| // timing dependent churn when generating testcases for the minipipeline. | ||
| func SortDNSLookupResults(inputs []*model.ArchivalDNSLookupResult) (outputs []*model.ArchivalDNSLookupResult) { | ||
| // copy the original slice | ||
| outputs = append([]*model.ArchivalDNSLookupResult{}, inputs...) | ||
|
|
||
| // sort using complex sorting rule | ||
| sort.SliceStable(outputs, func(i, j int) bool { | ||
| left, right := outputs[i], outputs[j] | ||
|
|
||
| // we sort groups by resolver type to avoid the churn caused by parallel runs | ||
| if left.Engine < right.Engine { | ||
| return true | ||
| } | ||
| if left.Engine > right.Engine { | ||
| return false | ||
| } | ||
|
|
||
| // within the same group, we sort by ascending transaction ID | ||
| if left.TransactionID < right.TransactionID { | ||
| return true | ||
| } | ||
| if left.TransactionID > right.TransactionID { | ||
| return false | ||
| } | ||
|
|
||
| // we want entries that are successful to appear first | ||
| fsget := func(value *string) string { | ||
| if value == nil { | ||
| return "" | ||
| } | ||
| return *value | ||
| } | ||
| return fsget(left.Failure) < fsget(right.Failure) | ||
| }) | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // SortNetworkEvents is like [SortDNSLookupResults] but for network events. | ||
| func SortNetworkEvents(inputs []*model.ArchivalNetworkEvent) (outputs []*model.ArchivalNetworkEvent) { | ||
| // copy the original slice | ||
| outputs = append([]*model.ArchivalNetworkEvent{}, inputs...) | ||
|
|
||
| // sort using complex sorting rule | ||
| sort.SliceStable(outputs, func(i, j int) bool { | ||
| left, right := outputs[i], outputs[j] | ||
|
|
||
| // we sort by endpoint address to significantly reduce the churn | ||
| if left.Address < right.Address { | ||
| return true | ||
| } | ||
| if left.Address > right.Address { | ||
| return false | ||
| } | ||
|
|
||
| // if the address is the same, then we group by transaction | ||
| if left.TransactionID < right.TransactionID { | ||
| return true | ||
| } | ||
| if left.TransactionID > right.TransactionID { | ||
| return false | ||
| } | ||
|
|
||
| // with same transaction, we sort by increasing time | ||
| return left.T < right.T | ||
| }) | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // SortTCPConnectResults is like [SortDNSLookupResults] but for TCP connect results. | ||
| func SortTCPConnectResults( | ||
| inputs []*model.ArchivalTCPConnectResult) (outputs []*model.ArchivalTCPConnectResult) { | ||
| // copy the original slice | ||
| outputs = append([]*model.ArchivalTCPConnectResult{}, inputs...) | ||
|
|
||
| // sort using complex sorting rule | ||
| sort.SliceStable(outputs, func(i, j int) bool { | ||
| left, right := outputs[i], outputs[j] | ||
|
|
||
| // we sort by endpoint address to significantly reduce the churn | ||
| if left.IP < right.IP { | ||
| return true | ||
| } | ||
| if left.IP > right.IP { | ||
| return false | ||
| } | ||
| if left.Port < right.Port { | ||
| return true | ||
| } | ||
| if left.Port > right.Port { | ||
| return false | ||
| } | ||
|
|
||
| // if the address is the same, then we group by transaction | ||
| if left.TransactionID < right.TransactionID { | ||
| return true | ||
| } | ||
| if left.TransactionID > right.TransactionID { | ||
| return false | ||
| } | ||
|
|
||
| // with same transaction, we sort by increasing time | ||
| return left.T < right.T | ||
| }) | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // SortTLSHandshakeResults is like [SortDNSLookupResults] but for TLS handshake results. | ||
| func SortTLSHandshakeResults( | ||
| inputs []*model.ArchivalTLSOrQUICHandshakeResult) (outputs []*model.ArchivalTLSOrQUICHandshakeResult) { | ||
| // copy the original slice | ||
| outputs = append([]*model.ArchivalTLSOrQUICHandshakeResult{}, inputs...) | ||
|
|
||
| // sort using complex sorting rule | ||
| sort.SliceStable(outputs, func(i, j int) bool { | ||
| left, right := outputs[i], outputs[j] | ||
|
|
||
| // we sort by endpoint address to significantly reduce the churn | ||
| if left.Address < right.Address { | ||
bassosimone marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return true | ||
| } | ||
| if left.Address > right.Address { | ||
| return false | ||
| } | ||
|
|
||
| // if the address is the same, then we group by transaction | ||
| if left.TransactionID < right.TransactionID { | ||
| return true | ||
| } | ||
| if left.TransactionID > right.TransactionID { | ||
| return false | ||
| } | ||
|
|
||
| // with same transaction, we sort by increasing time | ||
| return left.T < right.T | ||
| }) | ||
|
|
||
| return | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is such that we have the endpoints in this event (because... why not? It helps with sorting and I don't see why omitting a piece of information we know would ever be wrong).