Some refactoring and added .rvmrc to .gitignore

This commit is contained in:
Arturo Pie 2011-05-30 13:40:44 -04:00
parent 139b96f434
commit b51bb8c136
4 changed files with 8 additions and 3 deletions

1
.gitignore vendored
View File

@ -18,5 +18,6 @@ coverage
rdoc rdoc
pkg pkg
tags tags
.rvmrc
## PROJECT::SPECIFIC ## PROJECT::SPECIFIC

View File

@ -115,7 +115,7 @@ class MasterTest < Test::Unit::TestCase
:workers => [{ :workers => [{
:type => :ssh, :type => :ssh,
:connect => 'localhost', :connect => 'localhost',
:directory => File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')), :directory => remote_dir_path,
:runners => 1 :runners => 1
}] }]
) )

View File

@ -98,7 +98,7 @@ class RunnerTest < Test::Unit::TestCase
should "be able to run a runner over ssh" do should "be able to run a runner over ssh" do
ssh = Hydra::SSH.new( ssh = Hydra::SSH.new(
'localhost', 'localhost',
File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')), remote_dir_path,
"ruby -e \"require 'rubygems'; require 'hydra'; Hydra::Runner.new(:io => Hydra::Stdio.new, :verbose => true);\"" "ruby -e \"require 'rubygems'; require 'hydra'; Hydra::Runner.new(:io => Hydra::Stdio.new, :verbose => true);\""
) )
assert ssh.gets.is_a?(Hydra::Messages::Runner::RequestFile) assert ssh.gets.is_a?(Hydra::Messages::Runner::RequestFile)

View File

@ -56,6 +56,10 @@ class Test::Unit::TestCase
def conflicting_test_file def conflicting_test_file
File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'conflicting.rb')) File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'conflicting.rb'))
end end
def remote_dir_path
File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
end
end end
module Hydra #:nodoc: module Hydra #:nodoc: