summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorMarc Chamberland <mchamberland@pbsc.com>2019-04-06 19:16:22 -0400
committerMarc Chamberland <mchamberland@pbsc.com>2019-04-19 19:02:35 -0400
commit33d1f9e3ad1013387a3b3a53d6969c905942b692 (patch)
treeff8ed416f691478e046a65210040311a6608d985 /spec/integration
parentf1a97f33d4b67645ed55ce6e15274d6adf396670 (diff)
downloadchef-33d1f9e3ad1013387a3b3a53d6969c905942b692.tar.gz
Replacing workmarks with distro constants
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 12826eb586..76304cc334 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 client .* is running, will wait for it to finish and then run./
+ while IO.read(Chef::Config[:log_location]) !~ /#{Chef::Dist::PRODUCT} 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 client .* is running, will wait for it to finish and then run./)
+ expect(run_log).to match(/#{Chef::Dist::PRODUCT} 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 Run complete in" }.length).to eq(2)
+ expect(run_log.lines.reject { |l| !l.include? "INFO: #{Chef::Dist::PRODUCT} Run complete in" }.length).to eq(2)
end
end