From cf56e3f0f7ede77fcad1a0b4855ab4765cb165ea Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 1 Dec 2016 17:33:00 +0800 Subject: [PATCH] Fix spec test for sync Change-Id: I8ffe7c003ebf04668162003dd99a93e5d08d08b2 --- spec/classes/nova_db_sync_api_spec.rb | 12 ++++++++++-- spec/classes/nova_db_sync_spec.rb | 16 ++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/spec/classes/nova_db_sync_api_spec.rb b/spec/classes/nova_db_sync_api_spec.rb index ff287b7c3..0302fb86a 100644 --- a/spec/classes/nova_db_sync_api_spec.rb +++ b/spec/classes/nova_db_sync_api_spec.rb @@ -8,7 +8,11 @@ describe 'nova::db::sync_api' do is_expected.to contain_exec('nova-db-sync-api').with( :command => '/usr/bin/nova-manage api_db sync', :refreshonly => 'true', - :logoutput => 'on_failure' + :logoutput => 'on_failure', + :subscribe => ['Anchor[nova::install::end]', + 'Anchor[nova::config::end]', + 'Anchor[nova::dbsync_api::begin]'], + :notify => 'Anchor[nova::dbsync_api::end]', ) end @@ -23,7 +27,11 @@ describe 'nova::db::sync_api' do is_expected.to contain_exec('nova-db-sync-api').with( :command => '/usr/bin/nova-manage --config-file /etc/nova/nova.conf api_db sync', :refreshonly => 'true', - :logoutput => 'on_failure' + :logoutput => 'on_failure', + :subscribe => ['Anchor[nova::install::end]', + 'Anchor[nova::config::end]', + 'Anchor[nova::dbsync_api::begin]'], + :notify => 'Anchor[nova::dbsync_api::end]', ) } end diff --git a/spec/classes/nova_db_sync_spec.rb b/spec/classes/nova_db_sync_spec.rb index fd3e7d24a..8487f7540 100644 --- a/spec/classes/nova_db_sync_spec.rb +++ b/spec/classes/nova_db_sync_spec.rb @@ -8,7 +8,13 @@ describe 'nova::db::sync' do is_expected.to contain_exec('nova-db-sync').with( :command => '/usr/bin/nova-manage db sync', :refreshonly => 'true', - :logoutput => 'on_failure' + :try_sleep => 5, + :tries => 10, + :logoutput => 'on_failure', + :subscribe => ['Anchor[nova::install::end]', + 'Anchor[nova::config::end]', + 'Anchor[nova::dbsync::begin]'], + :notify => 'Anchor[nova::dbsync::end]', ) end @@ -23,7 +29,13 @@ describe 'nova::db::sync' do is_expected.to contain_exec('nova-db-sync').with( :command => '/usr/bin/nova-manage --config-file /etc/nova/nova.conf db sync', :refreshonly => 'true', - :logoutput => 'on_failure' + :try_sleep => 5, + :tries => 10, + :logoutput => 'on_failure', + :subscribe => ['Anchor[nova::install::end]', + 'Anchor[nova::config::end]', + 'Anchor[nova::dbsync::begin]'], + :notify => 'Anchor[nova::dbsync::end]', ) } end