From a763f4a5d0cdd3c686b29e399ce777138e64edca Mon Sep 17 00:00:00 2001 From: diosmosis Date: Wed, 23 May 2018 00:24:11 -0700 Subject: Ensure consistent ordering in test output for travis-ci & local environments (#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. --- .../tests/UI/expected-screenshots/DashboardManager_expanded.png | 2 +- .../UI/expected-screenshots/DashboardManager_widget_list_shown.png | 4 ++-- .../tests/UI/expected-screenshots/DashboardManager_widget_preview.png | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Dashboard') diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png index 69ed6cc974..6a1fb82fd0 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65e3cba2e2af44c1c455d576181caeb1af7df42656f58efef97d43cc5a5b9c52 +oid sha256:fb0146d21b5b8e558bd967cf2936f7b1c07841dafd9997760c26723f1be99b8c size 46124 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index 53f32995f5..80627f4fb3 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c9077fffc5b11001f905b0cea0ec053c452378d8c25a47cef415563bc0942ed -size 56081 +oid sha256:ef6816ef81d2d23eedc1c0435ee26a2bf4c74975f86c27b5b77dfce1a6f095a7 +size 56067 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index 8920f771a2..0ce683dcc5 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c86cab3104470ce4187a56d9f007e9ed68f7cfc9fa61660c2c18cf74d93f71e5 -size 67776 +oid sha256:8abe002894e0aff93a144f79f81bb4a2e040e3d84848513186b8b1be00070a23 +size 67777 -- cgit v1.2.3