From 3e6af08d31ad7172340968c53d655e86b99081e9 Mon Sep 17 00:00:00 2001 From: Hugo Haakseth Date: Tue, 20 Feb 2024 23:54:17 +0100 Subject: [PATCH] Fix broken unit tests --- .../elasticsearch_keystore_spec.rb | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/spec/unit/provider/elasticsearch_keystore/elasticsearch_keystore_spec.rb b/spec/unit/provider/elasticsearch_keystore/elasticsearch_keystore_spec.rb index 355350b13..8da362a69 100644 --- a/spec/unit/provider/elasticsearch_keystore/elasticsearch_keystore_spec.rb +++ b/spec/unit/provider/elasticsearch_keystore/elasticsearch_keystore_spec.rb @@ -54,13 +54,15 @@ to receive(:execute). with( [executable, 'list'], - custom_environment: { - 'ES_INCLUDE' => defaults_file, - 'ES_PATH_CONF' => "/etc/elasticsearch/#{instance}" - }, - uid: 'elasticsearch', - gid: 'elasticsearch', - failonfail: true + { + custom_environment: { + 'ES_INCLUDE' => defaults_file, + 'ES_PATH_CONF' => "/etc/elasticsearch/#{instance}" + }, + uid: 'elasticsearch', + gid: 'elasticsearch', + failonfail: true + } ). and_return( Puppet::Util::Execution::ProcessOutput.new( @@ -118,13 +120,15 @@ receive(:execute). with( [executable, 'create'], - custom_environment: { - 'ES_INCLUDE' => '/etc/default/elasticsearch-es-03', - 'ES_PATH_CONF' => '/etc/elasticsearch/es-03' - }, - uid: 'elasticsearch', - gid: 'elasticsearch', - failonfail: true + { + custom_environment: { + 'ES_INCLUDE' => '/etc/default/elasticsearch-es-03', + 'ES_PATH_CONF' => '/etc/elasticsearch/es-03' + }, + uid: 'elasticsearch', + gid: 'elasticsearch', + failonfail: true + } ). and_return(Puppet::Util::Execution::ProcessOutput.new('', 0)) ) @@ -135,13 +139,15 @@ have_received(:execute). with( [executable, 'create'], - custom_environment: { - 'ES_INCLUDE' => '/etc/default/elasticsearch-es-03', - 'ES_PATH_CONF' => '/etc/elasticsearch/es-03' - }, - uid: 'elasticsearch', - gid: 'elasticsearch', - failonfail: true + { + custom_environment: { + 'ES_INCLUDE' => '/etc/default/elasticsearch-es-03', + 'ES_PATH_CONF' => '/etc/elasticsearch/es-03' + }, + uid: 'elasticsearch', + gid: 'elasticsearch', + failonfail: true + } ) ) end