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.

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

Fix compatibility with phpunit 9.3 in integration and api functional tests #30170

Conversation

ihor-sviziev
Copy link
Contributor

@ihor-sviziev ihor-sviziev commented Sep 23, 2020

Description (*)

Fixes compatibility with phpunit 9.3 and keeping backward compatibility with phpunit <9.3, similar what was done in symfony symfony/phpunit-bridge@9a87dd7

✔ Before my changes on phpunit 9.1:
❌ Before my changes on phpunit 9.3:
image

✔ After my changes on phpunit 9.1:
image
✔ After my changes on phpunit 9.3:
image

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes Integration Test Framework do not work out the box. Not compatible with PhpUnit 9.3.x #30146

Manual testing scenarios (*)

  1. Try to run integration tests
  2. Try to run api functional tests
  3. Upgrade to phpunit 9.3
  4. Try to run integration tests again
  5. Try to run api functional tests

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

@m2-assistant
Copy link

m2-assistant bot commented Sep 23, 2020

Hi @ihor-sviziev. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev
Copy link
Contributor Author

Seems like similar changes should be done in

use PHPUnit\TextUI\Configuration\Registry;
use PHPUnit\TextUI\Configuration\TestSuiteCollection;
use PHPUnit\TextUI\Configuration\TestSuiteMapper;
.

@ihor-sviziev ihor-sviziev marked this pull request as draft September 23, 2020 14:53
@sidolov sidolov added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Sep 23, 2020
@ihor-sviziev ihor-sviziev force-pushed the fix-integration-tests-phpunit-9.3 branch 2 times, most recently from d5524e7 to 5fbf456 Compare September 24, 2020 06:07
@ihor-sviziev ihor-sviziev force-pushed the fix-integration-tests-phpunit-9.3 branch from 5fbf456 to 62cad12 Compare September 24, 2020 06:08
@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev ihor-sviziev changed the title Fix compatibility with phpunit 9.3 in integration tests Fix compatibility with phpunit 9.3 in integration and api functional tests Sep 24, 2020
@ihor-sviziev ihor-sviziev marked this pull request as ready for review September 24, 2020 09:59
Copy link
Contributor

@lbajsarowicz lbajsarowicz left a comment

Choose a reason for hiding this comment

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

✔️ Verified locally and works as expected both with 9.3 and 9.1

Personally, I'm super happy with you proceeding the PHPUnit upgrades! Awesome job.

@magento-engcom-team
Copy link
Contributor

Hi @lbajsarowicz, thank you for the review.
ENGCOM-8266 has been created to process this Pull Request
✳️ @lbajsarowicz, could you please add one of the following labels to the Pull Request?

Label Description
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests
Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests
Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests

@engcom-Alfa engcom-Alfa self-assigned this Sep 24, 2020
@engcom-Alfa engcom-Alfa added the Auto-Tests: Covered All changes in Pull Request is covered by auto-tests label Sep 24, 2020
@engcom-Alfa
Copy link
Contributor

✔️ QA Passed

Case 1. Integration tests

Manual testing scenario:

  1. cd /dev/tests/integration;
  2. Run in console: ../../../vendor/phpunit/phpunit/phpunit --configuration phpunit.xml

Before:

✔️ PhpUnit 9.1
Screenshot from 2020-09-25 09-27-56

✖️ PhpUnit 9.3

Screenshot from 2020-09-25 09-56-57

After:

✔️ PhpUnit 9.1

Screenshot from 2020-09-25 10-13-08

✔️ PhpUnit 9.3

Screenshot from 2020-09-25 10-08-01

Case 2. Api-functional tests

  1. cd /dev/tests/api-functional;
  2. Run in console: ../../../vendor/phpunit/phpunit/phpunit --configuration phpunit_rest.xml testsuite/Magento/Sales

After:

✔️ PhpUnit 9.1

Screenshot from 2020-09-25 11-53-28

✔️ PhpUnit 9.3

Screenshot from 2020-09-25 11-57-41

@engcom-Alfa engcom-Alfa added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Sep 25, 2020
@magento-engcom-team magento-engcom-team merged commit 75f65c2 into magento:2.4-develop Sep 30, 2020
@m2-assistant
Copy link

m2-assistant bot commented Sep 30, 2020

Hi @ihor-sviziev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@ihor-sviziev ihor-sviziev deleted the fix-integration-tests-phpunit-9.3 branch October 1, 2020 08:35
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: category of expertise Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S2 Major restrictions or short-term circumventions are required until a fix is available.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Integration Test Framework do not work out the box. Not compatible with PhpUnit 9.3.x
5 participants