Update tests for changes to LOG:CONFIG and *debug-io* -> *terminal-io*

7max · May 13, 2013 · 973b99a · 973b99a
1 parent afc2c66
commit 973b99a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/tests/test-appenders.lisp b/tests/test-appenders.lisp
@@ -287,7 +287,7 @@ forever loop."
              (with-output-to-string (s)
                (with-output-to-string (ss) 
                  (let* ((a1 (make-instance 'fixed-stream-appender :stream s))
-                        (*debug-io* ss))
+                        (*global-console* ss))
                    (setq a2 (make-instance 'temp-appender-test-class))
                    (add-appender +self-meta-logger+ a1)
                    (log:config +self-meta-logger+ :info)
@@ -318,7 +318,7 @@ forever loop."
              (with-output-to-string (s)
                (with-output-to-string (ss) 
                  (let* ((a1 (make-instance 'fixed-stream-appender :stream s))
-                        (*debug-io* ss))
+                        (*global-console* ss))
                    (setq a2 (make-instance 'temp-appender-test-class))
                    (add-appender +self-meta-logger+ a1)
                    (log:config +self-meta-logger+ :info)

diff --git a/tests/test-compat.lisp b/tests/test-compat.lisp
@@ -8,19 +8,19 @@
   "Test that log statement with explicit logger produce output"
   (with-package-log-hierarchy
     (reset-logging-configuration)
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn (make-logger)  "Hello World!"))
                "WARN - Hello World!
 "))
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn '(blah test foobar)  "Hello World!"))
                "WARN - Hello World!
 "))
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn :foobar  "Hello World!"))
                "WARN - Hello World!
 "))
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn 'foobar  "Hello World!"))
                "WARN - Hello World!
 "))))
@@ -45,7 +45,7 @@ a logger, and that logging macros are correctly handling this
 situation"
   (with-package-log-hierarchy
     (reset-logging-configuration)
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-debug (returns-a-logger)  "Hello World!"))
                "DEBUG - Hello World!
 "))))

diff --git a/tests/test-configurator.lisp b/tests/test-configurator.lisp
@@ -349,5 +349,5 @@ done via property configurator, rather then directly"
       (log-config one :i :clear)
       (is (logger-appenders three))
       (is (not (log-debug :logger four)))
-      (log-config one :clear :all)
+      (log-config one :clear :appenders :all)
       (is (null (logger-appenders three))))))
diff --git a/tests/test-logger.lisp b/tests/test-logger.lisp
@@ -79,7 +79,7 @@ configuration"
   "Test that default logging configuration produces correct output"
   (with-package-log-hierarchy
     (reset-logging-configuration)
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn "Hello World!"))
                "WARN - Hello World!
 "))))
@@ -88,19 +88,19 @@ configuration"
   "Test that log statement with explicit logger produce output"
   (with-package-log-hierarchy
     (reset-logging-configuration)
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn :logger (make-logger)  "Hello World!"))
                "WARN - Hello World!
 "))
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn '(blah test foobar)  "Hello World!"))
                "WARN - Hello World!
 "))
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn :foobar  "Hello World!"))
                "WARN - Hello World!
 "))
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-warn 'foobar  "Hello World!"))
                "WARN - Hello World!
 "))))
@@ -136,7 +136,7 @@ a logger, and that logging macros are correctly handling this
 situation"
   (with-package-log-hierarchy
     (reset-logging-configuration)
-    (is (equal (with-output-to-string (*debug-io*)
+    (is (equal (with-output-to-string (*global-console*)
                  (log-debug :logger
                             (returns-a-logger)  "Hello World!"))
                "DEBUG - Hello World!