From b55e264a675f7621b8351e227b93742f19e01c7d Mon Sep 17 00:00:00 2001
From: Daniel Valenzuela <dsvalenzuela@uc.cl>
Date: Wed, 9 Nov 2022 19:43:10 -0300
Subject: [PATCH] Fix test_raising_repr test

Closes #10473

Python <3.11 versions depend on `exceptiongroup>=1.0.0rc8`, and they released version `1.0.1`
6 days ago (2022/11/03) that as a side-effect changed the output of exceptions.
---
 testing/test_assertion.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/testing/test_assertion.py b/testing/test_assertion.py
index d8844f2e41..7574592210 100644
--- a/testing/test_assertion.py
+++ b/testing/test_assertion.py
@@ -1664,15 +1664,7 @@ def test_raising_repr():
     """
     )
     result = pytester.runpytest()
-    if sys.version_info >= (3, 11):
-        # python 3.11 has native support for un-str-able exceptions
-        result.stdout.fnmatch_lines(
-            ["E       AssertionError: <exception str() failed>"]
-        )
-    else:
-        result.stdout.fnmatch_lines(
-            ["E       AssertionError: <unprintable AssertionError object>"]
-        )
+    result.stdout.fnmatch_lines(["E       AssertionError: <exception str() failed>"])
 
 
 def test_issue_1944(pytester: Pytester) -> None:
db7f4d7b6232'>tree</a><a href='/guix/commit/tests/grafts.scm?id=53ef4bf53775cf80959000667c5bdb7f4d7b6232'>commit</a><a href='/guix/diff/tests/grafts.scm?id=53ef4bf53775cf80959000667c5bdb7f4d7b6232'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/grafts.scm'>
<input type='hidden' name='id' value='53ef4bf53775cf80959000667c5bdb7f4d7b6232'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=53ef4bf53775cf80959000667c5bdb7f4d7b6232'>root</a>/<a href='/guix/log/tests?id=53ef4bf53775cf80959000667c5bdb7f4d7b6232'>tests</a>/<a href='/guix/log/tests/grafts.scm?id=53ef4bf53775cf80959000667c5bdb7f4d7b6232'>grafts.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/grafts.scm?id=53ef4bf53775cf80959000667c5bdb7f4d7b6232&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-10-28 00:17:23 +0200'>2023-10-28</span></td><td><a href='/guix/commit/tests/grafts.scm?id=67effc1560fc175dfbcb58ef5b965b08b3942d6c'>grafts: Fix corner case involving multiple-output derivations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes a bug that would occur with references to two outputs of the same
derivation, with one of them referring to the other one.

For example, the references of libreoffice include both mariadb:dev and
mariadb:lib; additionally, mariadb:dev refers to mariadb:lib.  In this
case, the glibc graft would not be applied on one of the mariadb paths,
and both the grafted and ungrafted glibc would end up in the closure of
libreoffice.

Fixes &lt;https://issues.guix.gnu.org/66662&gt;.

* guix/grafts.scm (non-self-references): Simplify and include references
to outputs of DRV other than OUTPUTS.
(reference-origins): Simplify and possibly return outputs of DRV itself.
(cumulative-grafts)[graft-origin?]: Add OUTPUT parameter and honor it.
[dependency-grafts]: Adjust accordingly.
* tests/grafts.scm ("graft-derivation, multiple outputs need to be replaced"):
New test.

Change-Id: Iac2005024ab7049037537b3af55298696ec90e3c
</span></span></td><td>Ludovic Courtès</td></tr>