[chore] Failure on 1st test run should not cause 2nd run to fail #35168
Conversation
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
pjanotti
commented
Sep 13, 2024
| @@ -301,6 +302,10 @@ func createTestConfig() *WindowsLogConfig { | |||
| // It returns a function that can be used to uninstall the event source, that function is never nil | |||
| func assertEventSourceInstallation(t *testing.T, src string) (uninstallEventSource func(), err error) { | |||
| err = eventlog.InstallAsEventCreate(src, eventlog.Info|eventlog.Warning|eventlog.Error) | |||
| if err != nil && strings.HasSuffix(err.Error(), " registry key already exists") { | |||
There was a problem hiding this comment.
Checking for the string because eventlog.InstallAsEventCreate doesn't return the win32 API error, but, a generic error with an english string, see https://cs.opensource.google/go/x/sys/+/refs/tags/v0.25.0:windows/svc/eventlog/install.go;l=44
dmitryax
approved these changes
Sep 13, 2024
djaglowski
approved these changes
Sep 13, 2024
pjanotti
deleted the
win-eventlog-tests-do-not-fail-if-regkey-exists
branch
jriguera
pushed a commit
to springernature/opentelemetry-collector-contrib
that referenced
this pull request
Oct 4, 2024
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.
Description:
If the first run of the tests fails without running the deferred code, the second run will fail on the registry entry already being present so no second run. This change ensures that if the event log source "leaked" from the first run the second run doesn't fail because the source is already present. Related conversation at #35032 (comment)
Testing:
Local runs.
Documentation:
N/A