stackforge
/
aviator
Code Issues Proposed changes

Differentiate between admin and member session 

We will use the admin session for the all_tenants test.
This commit is contained in:
Mark Maglana 2014-01-13 11:57:31 -08:00
parent e3c6a9ef96
commit 6daa7367a3
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/aviator/openstack/volume/v1/public/list_volumes_test.rb
View File

@ -5,26 +5,39 @@ class Aviator::Test
describe 'aviator/openstack/volume/v1/public/list_volumes' do
def admin_session
unless @admin_session
@admin_session = Aviator::Session.new(
config_file: Environment.path,
environment: 'openstack_admin'
)
@admin_session.authenticate
end
@admin_session
end
def create_request(session_data = get_session_data, &block)
klass.new(session_data, &block)
end
def session
unless @session
@session = Aviator::Session.new(
def member_session
unless @member_session
@member_session = Aviator::Session.new(
config_file: Environment.path,
environment: 'openstack_member'
)
@session.authenticate
@member_session.authenticate
end
@session
@member_session
end
def get_session_data
session.send :auth_info
member_session.send :auth_info
end
@ -33,19 +46,6 @@ class Aviator::Test
end
def session
unless @session
@session = Aviator::Session.new(
config_file: Environment.path,
environment: 'openstack_member'
)
@session.authenticate
end
@session
end
def helper
Aviator::Test::RequestHelper
end
@ -57,7 +57,7 @@ class Aviator::Test
def create_volume
session.volume_service.request :create_volume do |params|
member_session.volume_service.request :create_volume do |params|
params[:display_name] = 'Aviator Volume Test Name'
params[:display_description] = 'Aviator Volume Test Description'
params[:size] = '1'
@ -124,7 +124,7 @@ class Aviator::Test
validate_response 'no parameters are provided' do
create_volume
response = session.volume_service.request :list_volumes
response = member_session.volume_service.request :list_volumes
response.status.must_equal 200
response.body.wont_be_nil
@ -136,7 +136,7 @@ class Aviator::Test
validate_response 'parameters are valid' do
create_volume
response = session.volume_service.request :list_volumes do |params|
response = member_session.volume_service.request :list_volumes do |params|
params[:details] = true
params[:display_name] = 'Aviator Volume Test Name'
end
@ -150,7 +150,7 @@ class Aviator::Test
validate_response 'parameters are invalid' do
response = session.volume_service.request :list_volumes do |params|
response = member_session.volume_service.request :list_volumes do |params|
params[:display_name] = "derpderp"
end