summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marcparadise@users.noreply.github.com>2022-08-16 19:17:16 +0000
committerGitHub <noreply@github.com>2022-08-16 19:17:16 +0000
commit318a6960ea82041742edae69053b48ce02a7f642 (patch)
tree1c58097fcd9cce127fd89b73908e3b8dc3d1a478
parent805df23576c2ff7c6468933ebc7c90d286672d16 (diff)
parentab1b49d7b0529bcd9be1a434915007e74a6c447d (diff)
downloadchef-318a6960ea82041742edae69053b48ce02a7f642.tar.gz
Merge pull request #13118 from tmccombs/sysctl-newline
Add newline to end of sysctl files Current pipeline failures are environmental and not related to this change. Failing tests are kitchen, which does not have coverage for this resource.
-rw-r--r--lib/chef/resource/sysctl.rb2
-rw-r--r--spec/unit/resource/sysctl_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/resource/sysctl.rb b/lib/chef/resource/sysctl.rb
index 97f919fbc9..61f3686ccc 100644
--- a/lib/chef/resource/sysctl.rb
+++ b/lib/chef/resource/sysctl.rb
@@ -187,7 +187,7 @@ class Chef
sysctl_lines << "#{new_resource.key} = #{new_resource.value}"
- sysctl_lines.join("\n")
+ sysctl_lines.join("\n") + "\n"
end
end
diff --git a/spec/unit/resource/sysctl_spec.rb b/spec/unit/resource/sysctl_spec.rb
index 47556f5ee8..42b0c77d83 100644
--- a/spec/unit/resource/sysctl_spec.rb
+++ b/spec/unit/resource/sysctl_spec.rb
@@ -62,14 +62,14 @@ describe Chef::Resource::Sysctl do
context "when comment is a String" do
it "Returns content for use with a file resource" do
resource.comment("This sets foo / bar on our system")
- expect(provider.contruct_sysctl_content).to eql("# This sets foo / bar on our system\nfoo = bar")
+ expect(provider.contruct_sysctl_content).to eql("# This sets foo / bar on our system\nfoo = bar\n")
end
end
context "when comment is an Array" do
it "Returns content for use with a file resource" do
resource.comment(["This sets foo / bar on our system", "We need for baz"])
- expect(provider.contruct_sysctl_content).to eql("# This sets foo / bar on our system\n# We need for baz\nfoo = bar")
+ expect(provider.contruct_sysctl_content).to eql("# This sets foo / bar on our system\n# We need for baz\nfoo = bar\n")
end
end
end