From 85cee2138dc2c33672f08dfc42da43cb5e623db8 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Tue, 16 Apr 2019 20:25:16 +0100
Subject: [PATCH] Fix TestFile results not always ordered as expected values

self = <tests.checker.test_file.TestFile testMethod=test_good_dir_space>

    def test_good_dir_space (self):
...
>       self.direct(url, resultlines, recursionlevel=2)

tests/checker/test_file.py:173:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
tests/checker/__init__.py:260: in direct
    self.fail_unicode(text(os.linesep).join(l))
tests/checker/__init__.py:237: in fail_unicode
    self.fail(msg)
E   AssertionError: Differences found testing
---
 tests/checker/__init__.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/checker/__init__.py b/tests/checker/__init__.py
index ab108e7c..2dd74e45 100644
--- a/tests/checker/__init__.py
+++ b/tests/checker/__init__.py
@@ -65,6 +65,11 @@ class TestLogger (linkcheck.logger._Logger):
         # diff between expected and real output
         self.diff = []
 
+    def normalize(self, result_log):
+        # XXX we assume that each log entry has a URL key, maybe we should add an assert into log_url() to that effect?
+        sep = '\nurl '
+        return sep.join(sorted('\n'.join(result_log).split(sep))).splitlines()
+
     def start_output (self):
         """
         Nothing to do here.
@@ -119,6 +124,8 @@ class TestLogger (linkcheck.logger._Logger):
         """
         Stores differences between expected and result in self.diff.
         """
+        self.expected = self.normalize(self.expected)
+        self.result = self.normalize(self.result)
         for line in difflib.unified_diff(self.expected, self.result):
             if not isinstance(line, unicode):
                 # The ---, +++ and @@ lines from diff format are ascii encoded.