Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use a URI for the optional rsync configuration instead of just a host.

  • Loading branch information...
commit 9df6bdca6bce3c62a5213e11cc2752671b78d9ef 1 parent 27b6b5a
@lukemelia lukemelia authored
View
7 features/step_definitions/testjour_steps.rb
@@ -26,7 +26,7 @@
Given /^Testjour is configured to use this machine as the rsync host$/ do
@args ||= []
- @args << "--rsync-host=#{Socket.gethostname}"
+ @args << "--rsync-uri=#{Socket.gethostname}:/tmp/testjour_feature_run"
end
Given /^a file testjour_preload.rb at the root of the project that logs "Hello, world"$/ do
@@ -42,10 +42,11 @@
Dir.chdir(@full_dir) do
testjour_path = File.expand_path(File.dirname(__FILE__) + "/../../../../bin/testjour")
cmd = "#{testjour_path} #{@args.join(" ")}"
- puts cmd
+ # puts cmd
+
status, @stdout, @stderr = systemu(cmd)
@exit_code = status.exitstatus
- puts @stderr.to_s
+ # puts @stderr.to_s
end
end
View
8 lib/testjour/configuration.rb
@@ -33,9 +33,7 @@ def rsync_uri
end
def external_rsync_uri
- if @options[:rsync_host]
- @options[:rsync_host] + ":/tmp/testjour"
- end
+ @options[:rsync_uri]
end
def queue_host
@@ -182,8 +180,8 @@ def option_parser
@options[:queue_host] = queue_host
end
- opts.on("--rsync-host=RSYNC_HOST", "Use another server to host the codebase for slave rsync") do |rsync_host|
- @options[:rsync_host] = rsync_host
+ opts.on("--rsync-uri=RSYNC_URI", "Use another location to host the codebase for slave rsync (master will rsync to this URI first)") do |rsync_uri|
+ @options[:rsync_uri] = rsync_uri
end
opts.on("--max-local-slaves=MAX", "Maximum number of local slaves") do |max|
Please sign in to comment.
Something went wrong with that request. Please try again.