Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>

This patch fixes tests for Emacs 25.

Upstream bug URL:

https://github.com/gongo/json-reformat/issues/33

diff --git a/test/json-reformat-test.el b/test/json-reformat-test.el
index 7de3be1..b4a4dde 100644
--- a/test/json-reformat-test.el
+++ b/test/json-reformat-test.el
@@ -58,7 +58,7 @@
 (ert-deftest json-reformat-test:string-to-string ()
   (should (string= "\"foobar\"" (json-reformat:string-to-string "foobar")))
   (should (string= "\"fo\\\"o\\nbar\"" (json-reformat:string-to-string "fo\"o\nbar")))
-  (should (string= "\"\\u2661\"" (json-reformat:string-to-string "\u2661")))
+  (should (string= "\"♡\"" (json-reformat:string-to-string "\u2661")))
 
   (should (string= "\"^(amq\\\\.gen.*|amq\\\\.default)$\"" (json-reformat:string-to-string "^(amq\\.gen.*|amq\\.default)$")))
   )
@@ -148,6 +148,6 @@ bar\"" (json-reformat:string-to-string "fo\"o\nbar")))
 [{ foo : \"bar\" }, { \"foo\" : \"baz\" }]") ;; At 3 (line)
         (json-reformat-region (point-min) (point-max)))
       (should (string=
-               "JSON parse error [Reason] Bad string format: \"doesn't start with '\\\"'!\" [Position] In buffer, line 3 (char 6)"
+               "JSON parse error [Reason] Bad string format: \"doesn't start with \`\\\"'!\" [Position] In buffer, line 3 (char 6)"
                message-string))
       )))
-- 
2.15.1

f='/guix/commit/gnu/packages/opencog.scm?id=c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b'>commit</a><a href='/guix/diff/gnu/packages/opencog.scm?id=c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/opencog.scm'>
<input type='hidden' name='id' value='c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b'/><input type='hidden' name='showmsg' value='1'/><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=c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/packages?id=c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b&amp;showmsg=1'>packages</a>/<a href='/guix/log/gnu/packages/opencog.scm?id=c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b&amp;showmsg=1'>opencog.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/gnu/packages/opencog.scm?id=c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b'>Collapse</a>)</th><th class='left'>Author</th></tr>
cm (show-help): Describe option.
(order-packages): Add procedure.
(format-whole-file): Add 'order?' argument.
(%options): Add 'alphabetical-sort' option.
(guix-style): Alphabetically order packages in files.
* tests/guix-style.sh: Test alphabetical ordering.
* doc/guix.texi (Invoking guix style): Document option.

Change-Id: I4aa7c0bd0b6d42529ae7d304587ffb10bf5f4006
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Herman Rimm</td></tr>
<tr><td><span title='2023-04-21 16:16:38 +0200'>2023-04-21</span></td><td><a href='/guix/commit/tests/guix-style.sh?id=37dd69b44511dc73eb04bdebe8d82c9a0386338e'>tests: Fix checks for expected failures.</a><span class='msg-avail'>...<span class='msg-tooltip'>Addresses &lt;https://issues.guix.gnu.org/62406&gt;.

With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately.  Instead use '&amp;&amp; false' to indicate an expected failure.

* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... &amp;&amp; false' or `test ! ...` as appropriate.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eric Bavier</td></tr>
/span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2023-11-14 13:30:49 +0100'>2023-11-14</span></td><td><a href='/guix/commit/gnu/packages/agda.scm?id=7374e14f510b9d320145f4176b43ed92a89e5a67'>gnu: agda-stdlib: Update to 1.7.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/agda.scm (agda-stdlib): Update to 1.7.3.

Change-Id: Ic941073814a6a2150d470fc05218dc8d19954445
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2023-11-14 13:30:48 +0100'>2023-11-14</span></td><td><a href='/guix/commit/gnu/packages/agda.scm?id=a52175730607e4319bce06ead92510743ec2604c'>gnu: agda: Update to 2.6.4.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/agda.scm (agda): Update to 2.6.4.  Also build with
optimizations and cluster counting support.
* gnu/packages/patches/agda-use-sphinx-5.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.

Change-Id: I98a66678ec401b9201d9fd3a0f606fff9767b4bc
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2023-10-11 08:14:00 +0300'>2023-10-11</span></td><td><a href='/guix/commit/gnu/packages/agda.scm?id=cdc82b2f6e89ee2817419fa6d46ece6d2e424919'>gnu: agda-cubical: Add source file-name.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/agda.scm (agda-cubical)[source]: Add file-name field.
</span></span></td><td>Efraim Flashner</td></tr>