From f9e69bc8f4ce1ddd91bf7fe5c347a5eaacf14b63 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 20 Jan 2018 12:24:06 -0600 Subject: [PATCH] Re-enable gearman port listening check postconditions was starting zuul, not zuul-scheduler. If we start zuul-scheduler, then gearman should be running. Change-Id: Icf228843495717fbb89b76b4ebad6b74d6e72b54 --- spec/acceptance/basic_spec.rb | 7 +++---- spec/acceptance/fixtures/postconditions.pp | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index 3a4a11f..a83c5ac 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -179,9 +179,8 @@ describe 'puppet-zuul module', :if => ['debian', 'ubuntu'].include?(os[:family]) it { should be_listening } end - # TODO(mordred) Why is this not listening? - # describe port(4730) do - # it { should be_listening } - # end + describe port(4730) do + it { should be_listening } + end end end diff --git a/spec/acceptance/fixtures/postconditions.pp b/spec/acceptance/fixtures/postconditions.pp index 9551273..12e858a 100644 --- a/spec/acceptance/fixtures/postconditions.pp +++ b/spec/acceptance/fixtures/postconditions.pp @@ -1,5 +1,5 @@ -exec { 'starting zuul server': - command => '/etc/init.d/zuul start', +exec { 'starting zuul scheduler': + command => '/etc/init.d/zuul-scheduler start', } exec { 'starting zuul merger':