Permalink
Browse files

Merge "fix uaa tests to require uaa and respect $TMP"

  • Loading branch information...
daleolds authored and Gerrit Code Review committed Apr 12, 2012
2 parents b166f34 + fff49cf commit c66a82ee54331235c70793d0cc0665c437584c74
Showing with 5 additions and 4 deletions.
  1. +1 −2 features/step_definitions/uaa.rb
  2. +4 −2 rakelib/bvt.rake
@@ -1,8 +1,7 @@
require 'rest_client'
Given /^I know the UAA service base URL$/ do
- @uaabase = @client.info[:authenticationEndpoint]
- pending "no uaa authentication endpoint available" unless @uaabase
+ @uaabase = @client.info[:authorization_endpoint]
end
When /^I get the login prompts$/ do
View
@@ -1,6 +1,7 @@
$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
require "parallel_runner"
+require "tmpdir"
namespace :bvt do
task :run do
@@ -37,8 +38,9 @@ namespace :bvt do
task :run_uaa do
config_path=ENV['CLOUD_FOUNDRY_CONFIG_PATH']?"-DCLOUD_FOUNDRY_CONFIG_PATH=#{ENV['CLOUD_FOUNDRY_CONFIG_PATH']} ":''
- sh "cd #{CoreComponents.root}/uaa/uaa; MAVEN_OPTS=\"#{ENV['MAVEN_OPTS']}\" mvn -P vcap #{config_path}-Duaa.integration.test=true -Dtest=*IntegrationTests test | tee /tmp/uaa.bvt.log | grep 'BUILD SUCCESSFUL'" do |ok,status|
- logmsg = `tail -20 /tmp/uaa.bvt.log`
+ logfile = File.join(Dir.tmpdir, "uaa.bvt.log")
+ sh "cd #{CoreComponents.root}/uaa/uaa; MAVEN_OPTS=\"#{ENV['MAVEN_OPTS']}\" mvn -P vcap #{config_path}-Duaa.integration.test=true -Dtest=*IntegrationTests test | tee #{logfile} | grep 'BUILD SUCCESSFUL'" do |ok,status|
+ logmsg = `tail -20 #{logfile}`
ok or fail "UAA integration tests failed...truncated logs:\n#{logmsg}\nUAA integration tests failed"
end
end

0 comments on commit c66a82e

Please sign in to comment.