Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3823 refactor json #4296

Merged
merged 18 commits into from
Dec 21, 2020
Merged

3823 refactor json #4296

merged 18 commits into from
Dec 21, 2020

Conversation

rnapoles-rh
Copy link
Contributor

@rnapoles-rh rnapoles-rh commented Dec 9, 2020 •
edited
Loading

What type of PR is this?

/kind code-refactoring

What does does this PR do / why we need it:
New JSON matcher function that provides flexibility to match one or more values instead of having to compare with the full JSON string

Which issue(s) this PR fixes:

Fixes #3823

PR acceptance criteria:

How to test changes / Special notes to the reviewer:
Executed each test as:
ginkgo -randomizeAllSpecs -slowSpecThreshold=120 -timeout 7200s -nodes=1 -focus="[test string in describe section of the test]" [test_path, e.g. tests/integration]

@rnapoles-rh
Copy link
Contributor Author

/test v4.6-integration-e2e

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Dec 11, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Dec 11, 2020
@rnapoles-rh
Copy link
Contributor Author

/retest

@prietyc123
Copy link
Contributor

@rnapoles-rh We use MatchJSON function in most of our test files. Could you please replace it all over the test files.

dharmit
dharmit suggested changes Dec 14, 2020
View reviewed changes
tests/helper/helper_generic.go Outdated Show resolved Hide resolved
@rnapoles-rh
Copy link
Contributor Author

/retest

@dharmit
Copy link
Member

dharmit commented Dec 15, 2020

@rnapoles-rh Both the failures are related to the code change proposed in this PR. Can you please look into these failures?

  1. First failure is coming from https://github.com/openshift/odo/pull/4296/files#diff-ae5d2699e830fc0052b86751a2d5816e2f6381a8d27e71c28bb56e8c44651b26R45

     • Failure [4.595 seconds]
odo app command tests
/go/src/github.com/openshift/odo/tests/integration/cmd_app_test.go:12
  when running app delete, describe and list command on fresh cluster
  /go/src/github.com/openshift/odo/tests/integration/cmd_app_test.go:38
    should error out display the help [It]
    /go/src/github.com/openshift/odo/tests/integration/cmd_app_test.go:39
    Expected
      
        <bool>: false
    to equal
        <bool>: true
    /go/src/github.com/openshift/odo/tests/integration/cmd_app_test.go:45

  2. Second failure is coming from https://github.com/openshift/odo/pull/4296/files#diff-f55d1dcfa285f4e2e11df9fce169ec0b4256649e7a7c67ab11e33ed667d6dc8fR101

     • Failure [3.369 seconds]
odo preference and config command tests
/go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:13
  When configuring global config values
  /go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:68
    should show json output [It]
    /go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:96
    Expected
      
        <bool>: false
    to equal
        <bool>: true
    /go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:101

@rnapoles-rh
Copy link
Contributor Author

/retest

@dharmit
Copy link
Member

dharmit commented Dec 17, 2020

https://github.com/openshift/odo/pull/4296/files#diff-f55d1dcfa285f4e2e11df9fce169ec0b4256649e7a7c67ab11e33ed667d6dc8fR101

 • Failure [2.359 seconds]
odo preference and config command tests
/go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:13
  When configuring global config values
  /go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:68
    should show json output [It]
    /go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:96
    Expected
      
        <bool>: false
    to equal
        <bool>: true
    /go/src/github.com/openshift/odo/tests/integration/cmd_pref_config_test.go:101

@rnapoles-rh
Copy link
Contributor Author

/retest

prietyc123
prietyc123 suggested changes Dec 18, 2020
View reviewed changes
tests/integration/devfile/cmd_devfile_storage_test.go Outdated Show resolved Hide resolved
tests/integration/devfile/cmd_devfile_storage_test.go Outdated Show resolved Hide resolved
tests/integration/cmd_url_test.go Outdated Show resolved Hide resolved
@rnapoles-rh
Copy link
Contributor Author

The cmd_devfile_storage_test.go test fails in PSI environment, however it runs OK on Prow. Issue #4319 tracks this problem.

@prietyc123
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Dec 21, 2020
dharmit
dharmit reviewed Dec 21, 2020
View reviewed changes
Copy link
Member

@dharmit dharmit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dharmit, rnapoles-rh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. Required by Prow. label Dec 21, 2020
@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 14c98ec into redhat-developer:master Dec 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dharmit dharmit dharmit requested changes

@mohammedzee1000 mohammedzee1000 Awaiting requested review from mohammedzee1000

@prietyc123 prietyc123 Awaiting requested review from prietyc123

Assignees

@dharmit dharmit

@prietyc123 prietyc123

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Required by Prow. lgtm Indicates that a PR is ready to be merged. Required by Prow.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Refactor json output match through out the test script
6 participants
@rnapoles-rh @prietyc123 @dharmit @openshift-ci-robot @openshift-bot @openshift-merge-robot