Skip to content

Commit c1dbd99

Browse files
daipomWatson1978
andauthored
Backport(v1.16): tests: use never instead of dont_allow (#4671) (#4723)
Backported from a2b935a (#4671). Signed-off-by: Shizuo Fujita <fujita@clear-code.com> Co-authored-by: Watson <fujita@clear-code.com>
1 parent fa1cfbb commit c1dbd99

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

test/plugin/out_forward/test_socket_cache.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class SocketCacheTest < Test::Unit::TestCase
1717
assert_equal(socket, c.checkout_or('key') { socket })
1818
c.checkin(socket)
1919

20-
sock = dont_allow(mock!).open
20+
sock = mock!.open.never.subject
2121
assert_equal(socket, c.checkout_or('key') { sock.open })
2222
end
2323

@@ -130,7 +130,7 @@ def teardown
130130

131131
c = Fluent::Plugin::ForwardOutput::SocketCache.new(10, $log)
132132
sock = mock!.close { 'closed' }.subject
133-
sock2 = dont_allow(mock!).close
133+
sock2 = mock!.close.never.subject
134134
stub(sock).inspect
135135
stub(sock2).inspect
136136

@@ -154,7 +154,7 @@ def teardown
154154
Timecop.freeze(Time.parse('2016-04-13 14:00:00 +0900'))
155155

156156
c = Fluent::Plugin::ForwardOutput::SocketCache.new(10, $log)
157-
sock = dont_allow(mock!).close
157+
sock = mock!.close.never.subject
158158
stub(sock).inspect
159159
c.checkout_or('key') { sock }
160160

test/test_event_router.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def event_router
175175
test "don't call default collector when tag matched" do
176176
event_router.add_rule('test', output)
177177
assert_rr do
178-
dont_allow(default_collector).emit_events('test', is_a(OneEventStream))
178+
mock(default_collector).emit_events('test', is_a(OneEventStream)).never
179179
event_router.emit('test', Engine.now, 'k' => 'v')
180180
end
181181
# check emit handler doesn't catch rr error
@@ -201,7 +201,7 @@ def filter_stream(_tag, es); end
201201
event_router.add_rule('test', filter)
202202

203203
assert_rr do
204-
dont_allow(filter).filter_stream('test', is_a(OneEventStream)) { events }
204+
mock(filter).filter_stream('test', is_a(OneEventStream)).never
205205
event_router.emit('foo', Engine.now, 'k' => 'v')
206206
end
207207
end

0 commit comments

Comments
 (0)