Fix deep copy and don't modify original state #919
Merged
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
zen-dog
approved these changes
Oct 10, 2019
Comment on lines
+147
to
+150
| if err == nil || newStatus == nil || newStatus.Status != v1alpha1.ErrorStatus || newStatus.Phases[0].Status != v1alpha1.ErrorStatus || newStatus.Phases[0].Steps[0].Status != v1alpha1.ErrorStatus { | ||
| t.Fatalf("Expecting to get an error with fatal error in status for error in using enhancer, got %w, %v", err, newStatus) | ||
| } | ||
| } |
There was a problem hiding this comment.
wdyt:
Suggested change
| if err == nil || newStatus == nil || newStatus.Status != v1alpha1.ErrorStatus || newStatus.Phases[0].Status != v1alpha1.ErrorStatus || newStatus.Phases[0].Steps[0].Status != v1alpha1.ErrorStatus { | |
| t.Fatalf("Expecting to get an error with fatal error in status for error in using enhancer, got %w, %v", err, newStatus) | |
| } | |
| } | |
| assert. NoError(t, err) | |
| assert.Equal(t, newStatus.Phases[0].Status, v1alpha1.ErrorStatus, "Expected phase status to be an error") | |
| assert.Equal(t, newStatus.Phases[0].Step[0].Status, v1alpha1.ErrorStatus, "Expected step status to be an error") |
There was a problem hiding this comment.
I was trying to use pure go instead of asserts but I actually don't care here that much so ... sure :) we're using assert everywhere anyway
jbarrick-mesosphere
pushed a commit
that referenced
this pull request
Oct 17, 2019
* Introduce integration test for restart (#718) This introduces and integration test that: - creates instance - waits for deploy on that instance is finished - stops controller - updates instance CRD in the meantime - starts controller - verifies update plan was run This test was failing prior to the instance controller refactoring (the old controller logic was handling this wrong) * Fix namespace handling for plan command (#925) * Include CRDs in the -o yaml --dry-run (#923) * go mod changes makes repo dirty. this resolves that (#926) * Fix deep copy and don't modify original state (#919) * Fixes the release workflow for Docker images * Attempt to fix 'TestCheckResourceIntegration' flaky test (#914) * Do not use strategicmergepatch for CRDs (#936) * Plan status should show last executed plan, not just active plan (#931) * More consistent logging for install (#933) * fixing repo merge by name bug (#938) * Use built in isExists (#942) * Make it possible to opt out of junit (#950) * Maintainers is array, not object (#930) * Handle already exists in flaky test (#941) * Cleanup lastexecutedplan method to remove the flake (#949) * Fix docs for instance name in install (#943) * add namespace flag for kudo init (#903) * Fix 'run_tests' script * Use a shell script for E2E test commands The script is similar to the one used for integration tests. This also allows to not use JUnit output. * Copy E2E test script into test container * Fix permissions of E2E test script * Distinguish between local and operator E2E tests Tests in the 'test/e2e' folder are run as part of the E2E tests in addition to the operator tests.
jbarrick-mesosphere
added a commit
that referenced
this pull request
Oct 17, 2019
fix make docker privs add go-junit-report add docker CLI to test dockerfile fix docker cli install fix docker run command fix docker fix networking remove CMD from dockerfile E2E test additions (#958) * Introduce integration test for restart (#718) This introduces and integration test that: - creates instance - waits for deploy on that instance is finished - stops controller - updates instance CRD in the meantime - starts controller - verifies update plan was run This test was failing prior to the instance controller refactoring (the old controller logic was handling this wrong) * Fix namespace handling for plan command (#925) * Include CRDs in the -o yaml --dry-run (#923) * go mod changes makes repo dirty. this resolves that (#926) * Fix deep copy and don't modify original state (#919) * Fixes the release workflow for Docker images * Attempt to fix 'TestCheckResourceIntegration' flaky test (#914) * Do not use strategicmergepatch for CRDs (#936) * Plan status should show last executed plan, not just active plan (#931) * More consistent logging for install (#933) * fixing repo merge by name bug (#938) * Use built in isExists (#942) * Make it possible to opt out of junit (#950) * Maintainers is array, not object (#930) * Handle already exists in flaky test (#941) * Cleanup lastexecutedplan method to remove the flake (#949) * Fix docs for instance name in install (#943) * add namespace flag for kudo init (#903) * Fix 'run_tests' script * Use a shell script for E2E test commands The script is similar to the one used for integration tests. This also allows to not use JUnit output. * Copy E2E test script into test container * Fix permissions of E2E test script * Distinguish between local and operator E2E tests Tests in the 'test/e2e' folder are run as part of the E2E tests in addition to the operator tests.
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.
What this PR does / why we need it:
Fixes two issues:
prepareKubernetesResourceswhich worked exactly because the shallow copy was a wrong choice but it's not what we want to do