From a80ac594c67f9bb61cc9be1de092817d8f050774 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 7 Sep 2022 01:09:09 +0900 Subject: [PATCH] Ubuntu: Re-enable watcher in acceptance tests The watcher service has been untested since [1] was merged but the issue has been fixed already. [1] eb0fb263b876927c7bcf2f16e288b254beb4d885 Change-Id: I0b7254efff0acd3c13acfcf149192613bc8f0746 --- spec/acceptance/10_basic_watcher_spec.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/spec/acceptance/10_basic_watcher_spec.rb b/spec/acceptance/10_basic_watcher_spec.rb index 7c9aa15..44a950b 100644 --- a/spec/acceptance/10_basic_watcher_spec.rb +++ b/spec/acceptance/10_basic_watcher_spec.rb @@ -13,11 +13,7 @@ describe 'basic watcher' do include openstack_integration::mysql include openstack_integration::keystone - # TODO(aschultz): fix after Ubuntu ocata-m3/rc1. watcher-db-manage is - # broken - if ($::osfamily == 'RedHat') { - include openstack_integration::watcher - } + include openstack_integration::watcher EOS # Run it twice and test for idempotency @@ -25,10 +21,8 @@ describe 'basic watcher' do apply_manifest(pp, :catch_changes => true) end - if os[:family].casecmp('RedHat') == 0 - describe port(9322) do - it { is_expected.to be_listening } - end + describe port(9322) do + it { is_expected.to be_listening } end end