1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From: Hleb Valoshka <375gnu@gmail.com>
Date: Wed, 15 Jul 2015 12:38:01 +0300
Subject: Backport 7b1f872 to fix failures when LANG=C
---
test/appenders/test_buffered_io.rb | 9 ++++++---
test/appenders/test_file.rb | 3 +--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/appenders/test_buffered_io.rb b/test/appenders/test_buffered_io.rb
index 8b7e850..62642b4 100644
--- a/test/appenders/test_buffered_io.rb
+++ b/test/appenders/test_buffered_io.rb
@@ -10,9 +10,12 @@ module TestAppenders
def setup
super
- @appender = Logging.appenders.string_io(
- 'test_appender', :auto_flushing => 3, :immediate_at => :error
- )
+ @appender = Logging.appenders.string_io \
+ 'test_appender',
+ :auto_flushing => 3,
+ :immediate_at => :error,
+ :encoding => 'UTF-8'
+
@appender.clear
@sio = @appender.sio
@levels = Logging::LEVELS
diff --git a/test/appenders/test_file.rb b/test/appenders/test_file.rb
index a71f4bd..a31dd89 100644
--- a/test/appenders/test_file.rb
+++ b/test/appenders/test_file.rb
@@ -100,14 +100,13 @@ module TestAppenders
def test_encoding
log = File.join(TMP, 'file-encoding.log')
- #appender = Logging.appenders.file(NAME, :filename => log, :encoding => 'ISO-8859-16')
appender = Logging.appenders.file(NAME, :filename => log, :encoding => 'ASCII')
appender << "A normal line of text\n"
appender << "ümlaut\n"
appender.close
- lines = File.readlines(log)
+ lines = File.readlines(log, :encoding => 'UTF-8')
assert_equal "A normal line of text\n", lines[0]
assert_equal "ümlaut\n", lines[1]
|
