Author: ehuelsmann
Date: Fri Feb 10 16:29:52 2006
New Revision: 71
Modified:
usocket/trunk/condition.lisp
usocket/trunk/package.lisp
usocket/trunk/run-usocket-tests.sh
usocket/trunk/test/test-usocket.lisp
Log:
Make the tests work again.
Modified: usocket/trunk/condition.lisp
==============================================================================
--- usocket/trunk/condition.lisp (original)
+++ usocket/trunk/condition.lisp Fri Feb 10 16:29:52 2006
@@ -13,7 +13,7 @@
;;###FIXME: no slots (yet); should at least be the affected usocket...
(:documentation "Parent condition for all socket related conditions."))
-(define-condition socket-error (usocket-condition error)
+(define-condition socket-error (socket-condition error)
() ;; no slots (yet)
(:documentation "Parent error for all socket related errors"))
@@ -41,9 +41,9 @@
;; Mass define and export our conditions
(define-usocket-condition-classes
(interrupted-condition)
- (usocket-condition))
+ (socket-condition))
-(define-condition unknown-condition (usocket-condition)
+(define-condition unknown-condition (socket-condition)
((real-condition :initarg :real-condition
:accessor usocket-real-condition))
(:documentation "Condition raised when there's no other - more applicable -
@@ -71,9 +71,9 @@
host-unreachable-error
shutdown-error
timeout-error)
- (usocket-error))
+ (socket-error))
-(define-condition unknown-error (usocket-error)
+(define-condition unknown-error (socket-error)
((real-error :initarg :real-error
:accessor usocket-real-error))
(:documentation "Error raised when there's no other - more applicable -
Modified: usocket/trunk/package.lisp
==============================================================================
--- usocket/trunk/package.lisp (original)
+++ usocket/trunk/package.lisp Fri Feb 10 16:29:52 2006
@@ -25,8 +25,8 @@
:vector-quad-to-dotted-quad
:dotted-quad-to-vector-quad
- :usocket-condition ; conditions
- :usocket-error ; errors
+ :socket-condition ; conditions
+ :socket-error ; errors
:unknown-condition
:unknown-error)))
Modified: usocket/trunk/run-usocket-tests.sh
==============================================================================
--- usocket/trunk/run-usocket-tests.sh (original)
+++ usocket/trunk/run-usocket-tests.sh Fri Feb 10 16:29:52 2006
@@ -13,7 +13,7 @@
echo "
(require 'usocket-test)
-(usocket-test:run-usocket-tests)
+(usocket-test:do-tests)
(quit)
" | $my_lisp
Modified: usocket/trunk/test/test-usocket.lisp
==============================================================================
--- usocket/trunk/test/test-usocket.lisp (original)
+++ usocket/trunk/test/test-usocket.lisp Fri Feb 10 16:29:52 2006
@@ -15,21 +15,21 @@
(deftest socket-no-connect.1
(catch 'caught-error
- (handler-bind ((usocket:usocket-error
+ (handler-bind ((usocket:socket-error
#'(lambda (c) (throw 'caught-error nil))))
(usocket:socket-connect "127.0.0.0" 80)
t))
nil)
(deftest socket-no-connect.2
(catch 'caught-error
- (handler-bind ((usocket:usocket-error
+ (handler-bind ((usocket:socket-error
#'(lambda (c) (throw 'caught-error nil))))
(usocket:socket-connect #(127 0 0 0) 80)
t))
nil)
(deftest socket-no-connect.3
(catch 'caught-error
- (handler-bind ((usocket:usocket-error
+ (handler-bind ((usocket:socket-error
#'(lambda (c) (throw 'caught-error nil))))
(usocket:socket-connect 2130706432 80) ;; == #(127 0 0 0)
t))