lsp: add expect_report helper to lsp tests

ordering of reports returned appears to be different in ci tests than
local (arch dependent?).

avoid expecting reports in exact order by using expect_report(uri)
helper

Author: chrisfarms

test/lsp.py

@@ -1085,6 +1085,12 @@ def open_file_and_wait_for_diagnostics(
         )
         return self.wait_for_diagnostics(solc_process)
 
+    def expect_report(self, published_diagnostics, uri):
+        for report in published_diagnostics:
+            if report['uri'] == uri:
+                return report
+        self.expect_true(False, f"expected ${uri} in published_diagnostics")
+
     def expect_true(
         self,
         actual,
@@ -1567,16 +1573,14 @@ def test_remapping(self, solc: JsonRpcProcess) -> None:
         published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 2, "expected reports for two files")
 
-        report = published_diagnostics[0]
-        self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/otherlib.sol")
+        report = self.expect_report(published_diagnostics, file_with_remapped_import_uri)
         diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 1, "no diagnostics")
-        self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
+        self.expect_equal(len(diagnostics), 0, "no diagnostics")
 
-        report = published_diagnostics[1]
-        self.expect_equal(report['uri'], file_with_remapped_import_uri)
+        report = self.expect_report(published_diagnostics, f"{self.project_root_uri}/other-include-dir/otherlib/otherlib.sol")
         diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 0, "no diagnostics")
+        self.expect_equal(len(diagnostics), 1, "no diagnostics")
+        self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
 
     def test_custom_includes_with_full_project(self, solc: JsonRpcProcess) -> None:
         """