Permalink
Browse files

riak_test automation for the Ruby client tests.

  • Loading branch information...
1 parent 5cba5e6 commit 48957cbe27861835b95ceb4c68ca0fba601f8c94 @ksauzz ksauzz committed Apr 3, 2013
Showing with 11 additions and 3 deletions.
  1. +1 −1 Makefile
  2. +10 −2 client_tests/ruby/spec/helper.rb
View
@@ -53,7 +53,7 @@ distclean: clean
test: all
@./rebar skip_deps=true eunit
-test-client: test-clojure test-python test-erlang
+test-client: test-clojure test-python test-erlang test-ruby
test-python: test-boto
@@ -4,7 +4,7 @@
require 'tempfile'
def create_user(name)
- response = HTTParty.put("http://localhost:8080/riak-cs/user",
+ response = HTTParty.put("#{cs_uri}/riak-cs/user",
:body => {
:name => name,
:email => "#{name}@example.com"}.to_json,
@@ -19,13 +19,21 @@ def s3_conf
{
access_key_id: key_id,
secret_access_key: key_secret,
- proxy_uri: "http://localhost:8080",
+ proxy_uri: cs_uri,
use_ssl: false,
http_read_timeout: 2000,
max_retries: 0
}
end
+def cs_uri
+ "http://localhost:#{cs_port}"
+end
+
+def cs_port
+ ENV['CS_HTTP_PORT'] || 8080
+end
+
def new_mb_temp_file(size)
temp = Tempfile.new 'riakcs-test'
(size*1024*1024).times {|i| temp.write 0}

0 comments on commit 48957cb

Please sign in to comment.