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

b7543762060e'>commit</a><a href='/guix/diff/gnu/installer/utils.scm?id=fe6c31e3338f73f94fcbe6fc6ff8b7543762060e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/utils.scm'>
<input type='hidden' name='id' value='fe6c31e3338f73f94fcbe6fc6ff8b7543762060e'/><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=fe6c31e3338f73f94fcbe6fc6ff8b7543762060e'>root</a>/<a href='/guix/log/gnu?id=fe6c31e3338f73f94fcbe6fc6ff8b7543762060e'>gnu</a>/<a href='/guix/log/gnu/installer?id=fe6c31e3338f73f94fcbe6fc6ff8b7543762060e'>installer</a>/<a href='/guix/log/gnu/installer/utils.scm?id=fe6c31e3338f73f94fcbe6fc6ff8b7543762060e'>utils.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/installer/utils.scm?id=fe6c31e3338f73f94fcbe6fc6ff8b7543762060e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-09 17:49:22 +0100'>2022-12-09</span></td><td><a href='/guix/commit/gnu/installer/utils.scm?id=591af24ade1021d91a3e7c62fcc7a8c90f00d4bb'>installer: Print progress bars and such as soon as \r is read.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/59922&gt;.

Previously progress bars and related things would be buffered by
'run-external-command-with-line-hooks' until \n is read.

* gnu/installer/utils.scm (run-external-command-with-line-hooks): Use
'read-delimited' rather than 'get-line'.  Pass 'concat as the last
argument.
(%display-line-hook): Remove.
(run-command): Use 'display' instead of '%display-line-hook'.
(%syslog-line-hook): Add "\n" when LINE doesn't end in \n.
(%installer-log-line-hook): Do not add an extra newline.
(installer-log-line): Add an extra newline.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-10-20 10:50:50 +0200'>2022-10-20</span></td><td><a href='/guix/commit/gnu/installer/utils.scm?id=96bb00d20336f43fac2c42662e4b1d300e624738'>installer: Run the "guix system init" command in a PTY.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes: &lt;https://issues.guix.gnu.org/55360&gt;

* gnu/installer/utils.scm (run-external-command-with-handler/tty): New
procedure.
(run-external-command-with-line-hooks, run-command): Add a TTY? argument.
* gnu/installer/final.scm (install-system): Call run-command with TTY?
argument set to #true.
</span></span></td><td>Mathieu Othacehe</td></tr>