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

Ensure consistent ordering in test output for travis-ci & local environments #12957

Merged
merged 7 commits into from May 23, 2018

Conversation

diosmosis
Copy link
Member

@diosmosis diosmosis commented May 23, 2018

Changes:

  • Fixes the issue in travis-ci where some tests will fail there even if they pass locally. Turns out globr() order changed the order of Plugin::findMultipleComponents().
  • In ReportsProvider, if two widgets have the same categories/subcategories, compare report IDs.
  • In WidgetMetadata::sortWidgets(), if two widgets have the same category/subcategory (or same category & both have no subcategory), compare unique widget IDs.
  • In WidgetMetadata::sortWidgets(), fix bug where it was incorrectly checking for an empty subcategory.

@diosmosis diosmosis added c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels May 23, 2018
@diosmosis diosmosis added this to the 3.5.1 milestone May 23, 2018
@diosmosis diosmosis changed the title Ensure ordering across OSes in Filesystem::globr(). Ensure consistent ordering in test output for travis-ci & local environments May 23, 2018
Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

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

Looks good. Can be merged once the tests passed...

@sgiehl sgiehl merged commit a763f4a into 3.x-dev May 23, 2018
@sgiehl sgiehl deleted the travis-ci-glob-ordering branch May 23, 2018 07:24
InfinityVoid pushed a commit to InfinityVoid/matomo that referenced this pull request Oct 11, 2018
…onments (matomo-org#12957)

* Ensure ordering across OSes in Filesystem::globr().

* Fix ordering of FileSystemTest.

* Fix RawLogDaoTest.

* In ReportsProvider if two reports have the same category/subcategory, compare IDs.

* Fix two issues in WidgetMetadata sort: check for empty subcategory was wrong + if both subcategories missing, compare widget IDs + if subcategories equal, compare widgetIDs.

* Updating consistently ordered test results.

* Update more screenshots.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants