fix: use chomp instead of chop

in test there where instances where a required '>' was chopped off
voxpupuli · Oct 13, 2024 · 48a1154 · 48a1154
1 parent 1ac4ad1
commit 48a1154
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/lib/puppet/provider/cs_clone/pcs.rb b/lib/puppet/provider/cs_clone/pcs.rb
@@ -28,7 +28,7 @@ def change_clone_id(type, primitive, id, cib)
     return unless doc.root.attributes['id'] != id
 
     doc.root.attributes['id'] = id
-    cmd = [command(:cibadmin), '--replace', '--xpath', xpath, '--xml-text', doc.to_s.chop]
+    cmd = [command(:cibadmin), '--replace', '--xpath', xpath, '--xml-text', doc.to_s.chomp]
     self.class.run_command_in_cib(cmd, cib)
   end
 

diff --git a/spec/acceptance/cs_location_spec.rb b/spec/acceptance/cs_location_spec.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop:disable Style/FrozenStringLiteralComment
 
 require 'spec_helper_acceptance'
 
@@ -243,3 +243,5 @@ class { 'corosync':
     end
   end
 end
+
+# rubocop:enable Style/FrozenStringLiteralComment
diff --git a/spec/acceptance/cs_order_spec.rb b/spec/acceptance/cs_order_spec.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop:disable Style/FrozenStringLiteralComment
 
 require 'spec_helper_acceptance'
 
@@ -173,3 +173,5 @@ class { 'corosync':
     end
   end
 end
+
+# rubocop:enable Style/FrozenStringLiteralComment
diff --git a/spec/unit/puppet/provider/cs_clone_pcs_spec.rb b/spec/unit/puppet/provider/cs_clone_pcs_spec.rb
@@ -245,7 +245,7 @@ def clone_xml(name)
         Puppet::Util::Execution.expects(:execute).with(['cibadmin', '--query', '--xpath', xpath], failonfail: true, combine: true).at_least_once.returns(
           Puppet::Util::Execution::ProcessOutput.new(clone_xml('apache_service-clone'), 0)
         )
-        Puppet::Util::Execution.expects(:execute).with(['cibadmin', '--replace', '--xpath', xpath, '--xml-text', clone_xml('apache_service-newclone').chop], failonfail: true, combine: true).at_least_once.returns(
+        Puppet::Util::Execution.expects(:execute).with(['cibadmin', '--replace', '--xpath', xpath, '--xml-text', clone_xml('apache_service-newclone').chomp], failonfail: true, combine: true).at_least_once.returns(
           Puppet::Util::Execution::ProcessOutput.new('', 0)
         )
         instance.change_clone_id('primitive', 'apache_service', 'apache_service-newclone', nil)