Fix path.data content test for when there are multiple paths

elastic · Jun 19, 2018 · 95c0bff · 95c0bff
1 parent e1cfb90
commit 95c0bff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/integration/helpers/serverspec/shared_spec.rb b/test/integration/helpers/serverspec/shared_spec.rb
@@ -164,7 +164,7 @@
     else
       it { should contain "path.conf: /etc/elasticsearch/#{vars['es_instance_name']}" }
     end
-    its(:content) { should match "path.data: /var/lib/elasticsearch/localhost-#{vars['es_instance_name']}" }
+    its(:content) { should match "path.data: #{vars['data_dirs'].join(',')}" }
     its(:content) { should match "path.logs: /var/log/elasticsearch/localhost-#{vars['es_instance_name']}" }
   end
 end
diff --git a/test/integration/multi.yml b/test/integration/multi.yml
@@ -8,7 +8,8 @@
     - elasticsearch
   vars:
     es_instance_name: "master"
-    es_data_dirs: ["/opt/elasticsearch/master"]
+    es_data_dirs:
+      - "/opt/elasticsearch/master"
     es_config:
       discovery.zen.ping.unicast.hosts: "localhost:9300"
       http.port: 9200