chore: fix imports and unit tests #8857
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
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>
|
Thank you! |
jessesuen
approved these changes
Mar 22, 2022
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>
crenshaw-dev
commented
Mar 22, 2022
| @@ -266,7 +266,7 @@ func TestSetHealth(t *testing.T) { | |||
| app := newFakeApp() | |||
| deployment := kube.MustToUnstructured(&v1.Deployment{ | |||
| TypeMeta: metav1.TypeMeta{ | |||
| APIVersion: "apps/v1beta1", | |||
| APIVersion: "apps/v1", | |||
There was a problem hiding this comment.
idk why this fixes the test, and it worries me a little bit.
There was a problem hiding this comment.
I found it by inspecting compRes and noticed the sync status said something about "invalid GVK".
crenshaw-dev
commented
Mar 22, 2022
| @@ -289,7 +289,7 @@ func TestSetHealth(t *testing.T) { | |||
|
|
|||
| compRes := ctrl.appStateManager.CompareAppState(app, &defaultProj, "", app.Spec.Source, false, false, nil) | |||
|
|
|||
| assert.Equal(t, compRes.healthStatus.Status, health.HealthStatusHealthy) | |||
| assert.Equal(t, health.HealthStatusHealthy, compRes.healthStatus.Status) | |||
There was a problem hiding this comment.
Order was wrong. It should be expected, actual.
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>
Codecov Report
@@ Coverage Diff @@
## master #8857 +/- ##
==========================================
- Coverage 42.87% 42.85% -0.03%
==========================================
Files 186 186
Lines 23335 23359 +24
==========================================
+ Hits 10006 10011 +5
- Misses 11898 11914 +16
- Partials 1431 1434 +3
Continue to review full report at Codecov.
|
crenshaw-dev
added a commit
that referenced
this pull request
Apr 8, 2022
* proposal: support multiple sources for an Application Signed-off-by: ishitasequeira <isequeir@redhat.com> * addressed PR comments Signed-off-by: ishitasequeira <isequeir@redhat.com> * update summary Signed-off-by: ishitasequeira <isequeir@redhat.com> * feat: move watch params to struct (#8819) * add to approvers Signed-off-by: pashavictorovich <pavel@codefresh.io> * watch opts move to struct Signed-off-by: pashavictorovich <pavel@codefresh.io> * watch opts move to struct Signed-off-by: pashavictorovich <pavel@codefresh.io> Signed-off-by: ishitasequeira <isequeir@redhat.com> * Merge pull request from GHSA-2f5v-8r3f-8pww * fix: application resource APIs must enforce project restrictions Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> * Fix unit tests Signed-off-by: jannfis <jann@mistrust.net> Co-authored-by: jannfis <jann@mistrust.net> Signed-off-by: ishitasequeira <isequeir@redhat.com> * chore: fix imports and unit tests (#8857) * chore: fix imports Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix unit test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: keep changes minimal Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix another test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> Signed-off-by: ishitasequeira <isequeir@redhat.com> * feat: operation result and history table tests (#8887) * add to approvers Signed-off-by: pashavictorovich <pavel@codefresh.io> * print tables additional tests Signed-off-by: pashavictorovich <pavel@codefresh.io> * move to %q Signed-off-by: pashavictorovich <pavel@codefresh.io> Signed-off-by: ishitasequeira <isequeir@redhat.com> * fix: corrected applicationset binary name in manifests (#8954) Signed-off-by: rishabh625 <rishabhmishra625@gmail.com> Signed-off-by: ishitasequeira <isequeir@redhat.com> * Update proposed design to add 'ref' field instead of externalValuesField Signed-off-by: ishitasequeira <isequeir@redhat.com> * remove unwanted changes from PR added while rebase Signed-off-by: ishitasequeira <isequeir@redhat.com> Co-authored-by: pasha-codefresh <pavel@codefresh.io> Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Co-authored-by: jannfis <jann@mistrust.net> Co-authored-by: Michael Crenshaw <michael@crenshaw.dev> Co-authored-by: rishabh625 <43094970+rishabh625@users.noreply.github.com>
ashutosh16
pushed a commit
to ashutosh16/argo-cd
that referenced
this pull request
Apr 9, 2022
* proposal: support multiple sources for an Application Signed-off-by: ishitasequeira <isequeir@redhat.com> * addressed PR comments Signed-off-by: ishitasequeira <isequeir@redhat.com> * update summary Signed-off-by: ishitasequeira <isequeir@redhat.com> * feat: move watch params to struct (argoproj#8819) * add to approvers Signed-off-by: pashavictorovich <pavel@codefresh.io> * watch opts move to struct Signed-off-by: pashavictorovich <pavel@codefresh.io> * watch opts move to struct Signed-off-by: pashavictorovich <pavel@codefresh.io> Signed-off-by: ishitasequeira <isequeir@redhat.com> * Merge pull request from GHSA-2f5v-8r3f-8pww * fix: application resource APIs must enforce project restrictions Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> * Fix unit tests Signed-off-by: jannfis <jann@mistrust.net> Co-authored-by: jannfis <jann@mistrust.net> Signed-off-by: ishitasequeira <isequeir@redhat.com> * chore: fix imports and unit tests (argoproj#8857) * chore: fix imports Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix unit test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: keep changes minimal Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix another test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> Signed-off-by: ishitasequeira <isequeir@redhat.com> * feat: operation result and history table tests (argoproj#8887) * add to approvers Signed-off-by: pashavictorovich <pavel@codefresh.io> * print tables additional tests Signed-off-by: pashavictorovich <pavel@codefresh.io> * move to %q Signed-off-by: pashavictorovich <pavel@codefresh.io> Signed-off-by: ishitasequeira <isequeir@redhat.com> * fix: corrected applicationset binary name in manifests (argoproj#8954) Signed-off-by: rishabh625 <rishabhmishra625@gmail.com> Signed-off-by: ishitasequeira <isequeir@redhat.com> * Update proposed design to add 'ref' field instead of externalValuesField Signed-off-by: ishitasequeira <isequeir@redhat.com> * remove unwanted changes from PR added while rebase Signed-off-by: ishitasequeira <isequeir@redhat.com> Co-authored-by: pasha-codefresh <pavel@codefresh.io> Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Co-authored-by: jannfis <jann@mistrust.net> Co-authored-by: Michael Crenshaw <michael@crenshaw.dev> Co-authored-by: rishabh625 <43094970+rishabh625@users.noreply.github.com> Signed-off-by: asingh51 <Ashutosh_Singh@intuit.com>
wojtekidd
pushed a commit
to wojtekidd/argo-cd
that referenced
this pull request
Apr 25, 2022
* chore: fix imports Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix unit test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: keep changes minimal Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix another test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> Signed-off-by: wojtekidd <wojtek.cichon@protonmail.com>
wojtekidd
pushed a commit
to wojtekidd/argo-cd
that referenced
this pull request
Apr 25, 2022
* proposal: support multiple sources for an Application Signed-off-by: ishitasequeira <isequeir@redhat.com> * addressed PR comments Signed-off-by: ishitasequeira <isequeir@redhat.com> * update summary Signed-off-by: ishitasequeira <isequeir@redhat.com> * feat: move watch params to struct (argoproj#8819) * add to approvers Signed-off-by: pashavictorovich <pavel@codefresh.io> * watch opts move to struct Signed-off-by: pashavictorovich <pavel@codefresh.io> * watch opts move to struct Signed-off-by: pashavictorovich <pavel@codefresh.io> Signed-off-by: ishitasequeira <isequeir@redhat.com> * Merge pull request from GHSA-2f5v-8r3f-8pww * fix: application resource APIs must enforce project restrictions Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> * Fix unit tests Signed-off-by: jannfis <jann@mistrust.net> Co-authored-by: jannfis <jann@mistrust.net> Signed-off-by: ishitasequeira <isequeir@redhat.com> * chore: fix imports and unit tests (argoproj#8857) * chore: fix imports Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix unit test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: keep changes minimal Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> * chore: fix another test Signed-off-by: Michael Crenshaw <michael@crenshaw.dev> Signed-off-by: ishitasequeira <isequeir@redhat.com> * feat: operation result and history table tests (argoproj#8887) * add to approvers Signed-off-by: pashavictorovich <pavel@codefresh.io> * print tables additional tests Signed-off-by: pashavictorovich <pavel@codefresh.io> * move to %q Signed-off-by: pashavictorovich <pavel@codefresh.io> Signed-off-by: ishitasequeira <isequeir@redhat.com> * fix: corrected applicationset binary name in manifests (argoproj#8954) Signed-off-by: rishabh625 <rishabhmishra625@gmail.com> Signed-off-by: ishitasequeira <isequeir@redhat.com> * Update proposed design to add 'ref' field instead of externalValuesField Signed-off-by: ishitasequeira <isequeir@redhat.com> * remove unwanted changes from PR added while rebase Signed-off-by: ishitasequeira <isequeir@redhat.com> Co-authored-by: pasha-codefresh <pavel@codefresh.io> Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Co-authored-by: jannfis <jann@mistrust.net> Co-authored-by: Michael Crenshaw <michael@crenshaw.dev> Co-authored-by: rishabh625 <43094970+rishabh625@users.noreply.github.com> Signed-off-by: wojtekidd <wojtek.cichon@protonmail.com>
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.
Signed-off-by: Michael Crenshaw michael@crenshaw.dev
Note on DCO:
If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.
Checklist: