Merge "Fix inconsistent indents in spec file"
This commit is contained in:
commit
dce45ff052
@ -289,11 +289,12 @@ describe 'tempest' do
|
|||||||
is_expected.to contain_tempest_config('scenario/img_file').with(:value => '/var/lib/tempest/cirros-0.4.0-x86_64-disk.img')
|
is_expected.to contain_tempest_config('scenario/img_file').with(:value => '/var/lib/tempest/cirros-0.4.0-x86_64-disk.img')
|
||||||
is_expected.to contain_tempest_config('service_broker/run_service_broker_tests').with(:value => false)
|
is_expected.to contain_tempest_config('service_broker/run_service_broker_tests').with(:value => false)
|
||||||
is_expected.to contain_oslo__log('tempest_config').with(
|
is_expected.to contain_oslo__log('tempest_config').with(
|
||||||
:debug => false,
|
:debug => false,
|
||||||
:log_file => '<SERVICE DEFAULT>',
|
:log_file => '<SERVICE DEFAULT>',
|
||||||
:use_stderr => true,
|
:use_stderr => true,
|
||||||
:use_syslog => false,
|
:use_syslog => false,
|
||||||
:logging_context_format_string => '<SERVICE DEFAULT>')
|
:logging_context_format_string => '<SERVICE DEFAULT>'
|
||||||
|
)
|
||||||
|
|
||||||
is_expected.not_to contain_tempest_config('magnum/keypair_id').with_value('default')
|
is_expected.not_to contain_tempest_config('magnum/keypair_id').with_value('default')
|
||||||
end
|
end
|
||||||
@ -322,10 +323,10 @@ describe 'tempest' do
|
|||||||
|
|
||||||
it 'sets up virtualenv for tempest' do
|
it 'sets up virtualenv for tempest' do
|
||||||
is_expected.to contain_exec('setup-venv').with(
|
is_expected.to contain_exec('setup-venv').with(
|
||||||
:command => "virtualenv -p python3 /var/lib/tempest/.venv && /var/lib/tempest/.venv/bin/#{platform_params[:pip_command]} install -U -r requirements.txt",
|
:command => "virtualenv -p python3 /var/lib/tempest/.venv && /var/lib/tempest/.venv/bin/#{platform_params[:pip_command]} install -U -r requirements.txt",
|
||||||
:cwd => '/var/lib/tempest',
|
:cwd => '/var/lib/tempest',
|
||||||
:unless => 'test -d /var/lib/tempest/.venv',
|
:unless => 'test -d /var/lib/tempest/.venv',
|
||||||
:path => ['/bin', '/usr/bin', '/usr/local/bin']
|
:path => ['/bin', '/usr/bin', '/usr/local/bin']
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -345,40 +346,40 @@ describe 'tempest' do
|
|||||||
|
|
||||||
context 'install Tempest from package' do
|
context 'install Tempest from package' do
|
||||||
let :params do
|
let :params do
|
||||||
{:install_from_source => false,
|
{ :install_from_source => false,
|
||||||
:image_name => 'image name',
|
:image_name => 'image name',
|
||||||
:image_name_alt => 'image name alt'}
|
:image_name_alt => 'image name alt' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'checks for tempest package' do
|
it 'checks for tempest package' do
|
||||||
is_expected.to contain_package('tempest').with(
|
is_expected.to contain_package('tempest').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:name => platform_params[:package_name],
|
:name => platform_params[:package_name],
|
||||||
:tag => ['openstack', 'tempest-package'],
|
:tag => ['openstack', 'tempest-package'],
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
it 'creates tempest workspace' do
|
it 'creates tempest workspace' do
|
||||||
is_expected.to contain_exec('tempest-workspace').with(
|
is_expected.to contain_exec('tempest-workspace').with(
|
||||||
:command => 'tempest init /var/lib/tempest',
|
:command => 'tempest init /var/lib/tempest',
|
||||||
:path => ['/bin', '/usr/bin'],
|
:path => ['/bin', '/usr/bin'],
|
||||||
:refreshonly => true,
|
:refreshonly => true,
|
||||||
:require => 'Package[tempest]'
|
:require => 'Package[tempest]'
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'tempest workspace customization' do
|
context 'tempest workspace customization' do
|
||||||
let :params do
|
let :params do
|
||||||
{:tempest_workspace => '/tmp/tempest',
|
{ :tempest_workspace => '/tmp/tempest',
|
||||||
:image_name => 'image name',
|
:image_name => 'image name',
|
||||||
:image_name_alt => 'image name alt',
|
:image_name_alt => 'image name alt',
|
||||||
:install_from_source => false}
|
:install_from_source => false }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'supports customizes tempest workspace' do
|
it 'supports customizes tempest workspace' do
|
||||||
is_expected.to contain_exec('tempest-workspace').with(
|
is_expected.to contain_exec('tempest-workspace').with(
|
||||||
:command => 'tempest init /tmp/tempest',
|
:command => 'tempest init /tmp/tempest',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -505,5 +506,5 @@ describe 'tempest' do
|
|||||||
it_behaves_like 'tempest'
|
it_behaves_like 'tempest'
|
||||||
it_behaves_like 'tempest with plugins packages'
|
it_behaves_like 'tempest with plugins packages'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user