From 5b135ed130906546980c603b90b3648b80479ff7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 3 Jan 2021 14:36:30 +0900
Subject: [PATCH] Fix ignored unit tests
Unit test files should be named like *_spec.rb.
Change-Id: I3fe97b4d5c9c2bb3709e37c561af353b859495ef
---
...ap_instances.rb => nova_cell_v2_map_instances_spec.rb} | 0
...ow_tables.rb => nova_cron_purge_shadow_tables_spec.rb} | 8 ++++----
spec/unit/type/{nova_cell_v2.rb => nova_cell_v2_spec.rb} | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename spec/classes/{nova_cell_v2_map_instances.rb => nova_cell_v2_map_instances_spec.rb} (100%)
rename spec/classes/{nova_cron_purge_shadow_tables.rb => nova_cron_purge_shadow_tables_spec.rb} (90%)
rename spec/unit/type/{nova_cell_v2.rb => nova_cell_v2_spec.rb} (100%)
diff --git a/spec/classes/nova_cell_v2_map_instances.rb b/spec/classes/nova_cell_v2_map_instances_spec.rb
similarity index 100%
rename from spec/classes/nova_cell_v2_map_instances.rb
rename to spec/classes/nova_cell_v2_map_instances_spec.rb
diff --git a/spec/classes/nova_cron_purge_shadow_tables.rb b/spec/classes/nova_cron_purge_shadow_tables_spec.rb
similarity index 90%
rename from spec/classes/nova_cron_purge_shadow_tables.rb
rename to spec/classes/nova_cron_purge_shadow_tables_spec.rb
index 1277b499a..bf40469f3 100644
--- a/spec/classes/nova_cron_purge_shadow_tables.rb
+++ b/spec/classes/nova_cron_purge_shadow_tables_spec.rb
@@ -26,7 +26,7 @@ describe 'nova::cron::purge_shadow_tables' do
it 'configures a nova purge cron with verbose output' do
is_expected.to contain_cron('nova-manage db purge').with(
- :command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` --verbose >>#{params[:destination]} 2>&1",
+ :command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` --verbose >>#{params[:destination]} 2>&1",
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
:user => params[:user],
:minute => params[:minute],
@@ -48,7 +48,7 @@ describe 'nova::cron::purge_shadow_tables' do
it 'configures a nova purge cron without verbose output' do
is_expected.to contain_cron('nova-manage db purge').with(
- :command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` >>#{params[:destination]} 2>&1",
+ :command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` >>#{params[:destination]} 2>&1",
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
:user => params[:user],
:minute => params[:minute],
@@ -70,7 +70,7 @@ describe 'nova::cron::purge_shadow_tables' do
it 'configures a nova purge cron with all cells enabled' do
is_expected.to contain_cron('nova-manage db purge').with(
- :command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +%D` --verbose --all-cells >>#{params[:destination]} 2>&1",
+ :command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` --all-cells >>#{params[:destination]} 2>&1",
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
:user => params[:user],
:minute => params[:minute],
@@ -92,7 +92,7 @@ describe 'nova::cron::purge_shadow_tables' do
it 'configures a nova purge cron with maxdelay' do
is_expected.to contain_cron('nova-manage db purge').with(
- :command => "sleep `expr ${RANDOM} \\% #{params[:maxdelay]}`; nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` --verbose --all-cells >>#{params[:destination]} 2>&1",
+ :command => "sleep `expr ${RANDOM} \\% #{params[:maxdelay]}`; nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` >>#{params[:destination]} 2>&1",
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
:user => params[:user],
:minute => params[:minute],
diff --git a/spec/unit/type/nova_cell_v2.rb b/spec/unit/type/nova_cell_v2_spec.rb
similarity index 100%
rename from spec/unit/type/nova_cell_v2.rb
rename to spec/unit/type/nova_cell_v2_spec.rb