Fix interruption test

src/euslime/bridge.py

@@ -97,7 +97,10 @@ def stop(self):
                 log.warn("failed to terminate: %s" % e)
 
     def reset(self):
-        self.euslime_connection.send("(lisp:reset)" + self.delim)
+        try:
+            self.exec_internal("(lisp:reset)" + self.delim, force_repl_socket=True)
+        except AbortEvaluation:
+            pass
 
     def ping(self):
         log.debug("Ping...")
@@ -241,6 +244,8 @@ def get_socket_response(self, connection, recursive=False):
             raise EuslispError(msg, stack)
         if command == 'abort':
             msg = loads(data)
+            if msg:
+                msg = "'{}'".format(msg)  # Better formatting
             raise AbortEvaluation(msg)
         raise Exception("Unhandled Socket Request Type: %s" % command)
 

tests/eus9-27_slime2-20.py

@@ -604,6 +604,7 @@ def test_emacs_interrupt_1(self):
              '(:emacs-interrupt 0)'],
             ['(:read-string 0 1)',
              '(:read-aborted 0 1)',
+             '(:new-package "USER" "B1-{}")'.format(self.EUSLISP_PROGRAM_NAME),
              '(:return (:abort "\'Keyboard Interrupt\'") 5)'])
         self.assertSocket(
             '(:emacs-rex (swank-repl:listener-eval "10\n") "USER" :repl-thread 6)',
@@ -612,6 +613,12 @@ def test_emacs_interrupt_1(self):
             '(:write-string "\\n" :repl-result)',
             '(:read-aborted 0 1)',
             '(:return (:ok nil) 6)')
+        self.assertSocket(
+            '(:emacs-rex (swank-repl:listener-eval "(reset)\n") "USER" :repl-thread 7)',
+            '(:read-string 0 1)',
+            '(:read-aborted 0 1)',
+            '(:new-package "USER" "{}")'.format(self.EUSLISP_PROGRAM_NAME),
+            '(:return (:ok nil) 7)')
 
     # SET PACKAGE
     def test_set_package_1(self):