@@ -244,9 +244,9 @@ Unable to continue without login and password. Do one of the following: log.error(e.to_s) rescue SystemStackError => e log.error(e.to_s) - ensure - return return_value end + + return return_value end end end lib/twibot/bot.rb @@ -179,6 +179,41 @@ class TestBot < Test::Unit::TestCase bot = Twibot::Bot.new(Twibot::Config.default) assert_equal :public, bot.instance_eval { @config.to_hash[:timeline_for] } end + + context "sandboxed network errors" do + should "rescue certain errors" do + bot = Twibot::Bot.new(Twibot::Config.default) + + assert_nothing_raised do + bot.send(:sandbox) { raise Twitter::RESTError.new } + bot.send(:sandbox) { raise Errno::ECONNRESET.new } + bot.send(:sandbox) { raise Timeout::Error.new } + bot.send(:sandbox) { raise EOFError.new } + bot.send(:sandbox) { raise Errno::ETIMEDOUT.new } + bot.send(:sandbox) { raise JSON::ParserError.new } + bot.send(:sandbox) { raise OpenSSL::SSL::SSLError.new } + bot.send(:sandbox) { raise SystemStackError.new } + end + end + + should "return default value if error is rescued" do + bot = Twibot::Bot.new(Twibot::Config.default) + assert_equal(42, bot.send(:sandbox, 42) { raise Twitter::RESTError }) + end + + should "not return default value when no error was raised" do + bot = Twibot::Bot.new(Twibot::Config.default) + assert_equal(65, bot.send(:sandbox, 42) { 65 }) + end + + should "not swallow unknown errors" do + bot = Twibot::Bot.new(Twibot::Config.default) + + assert_raise StandardError do + bot.send(:sandbox) { raise StandardError.new "Oops!" } + end + end + end end class TestBotMacros < Test::Unit::TestCase @@ -207,6 +242,28 @@ class TestBotMacros < Test::Unit::TestCase assert respond_to?(:twitter) assert respond_to?(:client) end + + context "posting replies" do + should "work with string messages" do + text = "Hey there" + status = Twitter::Status.new(:id => 123, + :text => "Some text", + :user => Twitter::User.new(:screen_name => "cjno")) + client.expects(:status).with(:reply, "@cjno #{text}", 123).returns(true) + + assert post_reply(status, text) + end + + should "work with status object messages" do + reply = Twitter::Status.new :text => "Hey there" + status = Twitter::Status.new(:id => 123, + :text => "Some text", + :user => Twitter::User.new(:screen_name => "cjno")) + client.expects(:status).with(:reply, "@cjno Hey there", 123).returns(true) + + assert post_reply(status, reply) + end + end end class TestBotHandlers < Test::Unit::TestCase test/test_bot.rb e7a13337cb1c1217cbc0f3a9133c53a848edeaf4 Christian Johansen christian@cjohansen.no http://github.com/cjohansen/twibot/commit/d5ccaad25c7a6f5e33a56283ec41e3faf72343e4 d5ccaad25c7a6f5e33a56283ec41e3faf72343e4 2009-05-24T13:53:23-07:00 2009-05-24T13:53:23-07:00 Fixed exception sandboxing so it doesn't swallow all exceptions. Added tests for sandbox and post_reply 93266c76c075d8d1bb4adc15b2d77f4e0c608874 Christian Johansen christian@cjohansen.no