@@ -2,15 +2,13 @@ require 'test/unit' require 'mocha' begin - gem 'net-ssh', ">= 2.0.0" require 'net/ssh' + require 'net/ssh/version' + raise LoadError, "wrong version" unless Net::SSH::Version::STRING >= '1.99.0' rescue LoadError - $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib" - begin + gem 'net-ssh', ">= 2.0.0" require 'net/ssh' - require 'net/ssh/version' - raise LoadError, "wrong version" unless Net::SSH::Version::STRING >= '1.99.0' rescue LoadError => e abort "could not load net/ssh v2 (#{e.inspect})" end @@ -170,4 +168,4 @@ module Protocol module V04; end module V05; end module V06; end -end \ No newline at end of file +end test/common.rb @@ -11,7 +11,11 @@ class Protocol::V04::TestName < Net::SFTP::TestCase end def teardown - ENV['TZ'] = @save_tz + if @save_tz + ENV['TZ'] = @save_tz + else + ENV.delete('TZ') + end end def test_directory? @@ -46,4 +50,4 @@ class Protocol::V04::TestName < Net::SFTP::TestCase assert_equal "-rwxr-xr-x jamis users 10240 Mar 12 03:40 test", @file.longname end -end \ No newline at end of file +end test/protocol/04/test_name.rb 84847dbb4361e9d35f064974bd292f37c3e0f6d1 Jamis Buck jamis@37signals.com http://github.com/jamis/net-sftp/commit/2cb3e6335c4e6b1d83e6cda305274cb2af2bf904 2cb3e6335c4e6b1d83e6cda305274cb2af2bf904 2008-09-06T15:13:47-07:00 2008-09-06T15:13:47-07:00 Tests all passing under Ruby 1.9 4b6b1245054ff3855743f2a998ac3c9a1ee50ef8 Jamis Buck jamis@37signals.com