summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorMarc Chamberland <mchamberland@pbsc.com>2019-04-06 23:16:54 -0400
committerMarc Chamberland <mchamberland@pbsc.com>2019-04-19 19:02:35 -0400
commitd2567df602b65102b908a918b5200898b137a614 (patch)
treec0fefd5585e059ea345edbf4a473b9e47b10497b /spec/integration
parentfd0508d32a3cd683b827c5d25f2bd07f0311243b (diff)
downloadchef-d2567df602b65102b908a918b5200898b137a614.tar.gz
addressing comments by coderanger
Signed-off-by: Marc Chamberland <mchamberland@pbsc.com>
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/solo/solo_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/integration/solo/solo_spec.rb b/spec/integration/solo/solo_spec.rb
index 76304cc334..efd889c5d0 100644
--- a/spec/integration/solo/solo_spec.rb
+++ b/spec/integration/solo/solo_spec.rb
@@ -163,7 +163,7 @@ describe "chef-solo" do
ruby_block "sleeping" do
block do
retries = 200
- while IO.read(Chef::Config[:log_location]) !~ /#{Chef::Dist::PRODUCT} client .* is running, will wait for it to finish and then run./
+ while IO.read(Chef::Config[:log_location]) !~ /.* client .* is running, will wait for it to finish and then run./
sleep 0.1
raise "we ran out of retries" if ( retries -= 1 ) <= 0
end
@@ -207,10 +207,10 @@ describe "chef-solo" do
run_log = File.read(path_to("logs/runs.log"))
# second run should have a message which indicates it's waiting for the first run
- expect(run_log).to match(/#{Chef::Dist::PRODUCT} client .* is running, will wait for it to finish and then run./)
+ expect(run_log).to match(/.* client .* is running, will wait for it to finish and then run./)
# both of the runs should succeed
- expect(run_log.lines.reject { |l| !l.include? "INFO: #{Chef::Dist::PRODUCT} Run complete in" }.length).to eq(2)
+ expect(run_log.lines.reject { |l| !l.include? "Run complete in" }.length).to eq(2)
end
end