Fix acceptance tests

Author: smortex

.sync.yml

@@ -7,7 +7,7 @@ Gemfile:
     ':system_tests':
       - gem: bcrypt
       - gem: rspec-retry
-      - gem: infrataster
+      - gem: simp-beaker-helpers
 spec/spec_helper.rb:
   hiera_config: "'spec/fixtures/hiera/hiera.yaml'"
 spec/spec_helper_acceptance.rb:

Gemfile

@@ -21,7 +21,7 @@ group :system_tests do
   gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
   gem 'bcrypt',                          :require => false
   gem 'rspec-retry',                     :require => false
-  gem 'infrataster',                     :require => false
+  gem 'simp-beaker-helpers',             :require => false
 end
 
 group :release do

lib/puppet/provider/elastic_rest.rb

@@ -158,7 +158,7 @@ def self.prefetch(resources)
         (p.key?(:password) ? p[:password].value : nil),
         (p.key?(:ca_file) ? p[:ca_file].value : nil),
         (p.key?(:ca_path) ? p[:ca_path].value : nil),
-        p[:validate_tls].value,
+        { validate_tls: p[:validate_tls].value },
       ]
       # Deduplicate identical settings, and fetch templates
     end.uniq

spec/helpers/acceptance/tests/basic_shared_examples.rb

@@ -49,21 +49,21 @@
         end
       end
 
-      describe server :container do
-        describe http("http://localhost:#{es_port}/_nodes/_local") do
-          it 'serves requests', :with_retries do
-            expect(response.status).to eq(200)
-          end
+      describe "http://localhost:#{es_port}/_nodes/_local" do
+        subject { shell("curl http://localhost:#{es_port}/_nodes/_local") }
 
-          it 'uses the default data path', :with_retries do
-            json = JSON.parse(response.body)['nodes'].values.first
-            data_dir = ['/var/lib/elasticsearch']
-            expect(
-              json['settings']['path']
-            ).to include(
-              'data' => data_dir
-            )
-          end
+        it 'serves requests', :with_retries do
+          expect(subject.exit_code).to eq(0)
+        end
+
+        it 'uses the default data path', :with_retries do
+          json = JSON.parse(subject.stdout)['nodes'].values.first
+          data_dir = ['/var/lib/elasticsearch']
+          expect(
+            json['settings']['path']
+          ).to include(
+            'data' => data_dir
+          )
         end
       end
     end

spec/helpers/acceptance/tests/datadir_shared_examples.rb

@@ -27,16 +27,14 @@
     end
   end
 
-  describe server :container do
-    describe http(
-      "http://localhost:#{es_port}/_nodes/_local"
-    ) do
-      it 'uses a custom data path' do
-        json = JSON.parse(response.body)['nodes'].values.first
-        expect(
-          json['settings']['path']['data']
-        ).to(datapaths.one? && v[:elasticsearch_major_version] <= 2 ? eq(datapaths.first) : contain_exactly(*datapaths))
-      end
+  describe "http://localhost:#{es_port}/_nodes/_local" do
+    subject { shell("curl http://localhost:#{es_port}/_nodes/_local") }
+
+    it 'uses a custom data path' do
+      json = JSON.parse(subject.stdout)['nodes'].values.first
+      expect(
+        json['settings']['path']['data']
+      ).to(datapaths.one? && v[:elasticsearch_major_version] <= 2 ? eq(datapaths.first) : contain_exactly(*datapaths))
     end
   end
 end

spec/helpers/acceptance/tests/pipeline_shared_examples.rb

@@ -46,14 +46,12 @@
     end
   end
 
-  describe server :container do
-    describe http(
-      "http://localhost:#{elasticsearch_port}/_ingest/pipeline"
-    ) do
-      it 'returns the configured pipelines', :with_retries do
-        expect(JSON.parse(response.body).values).
-          to include(include(pipeline))
-      end
+  describe "http://localhost:#{elasticsearch_port}/_ingest/pipeline" do
+    subject { shell("curl http://localhost:#{elasticsearch_port}/_ingest/pipeline") }
+
+    it 'returns the configured pipelines', :with_retries do
+      expect(JSON.parse(subject.stdout).values).
+        to include(include(pipeline))
     end
   end
 end

spec/helpers/acceptance/tests/plugin_api_shared_examples.rb

@@ -9,15 +9,13 @@
     end
   end
 
-  describe server :container do
-    describe http(
-      "http://localhost:#{es_config['http.port']}/_cluster/stats"
-    ) do
-      it desc, :with_retries do
-        expect(
-          JSON.parse(response.body)['nodes']['plugins']
-        ).to include(include(val))
-      end
+  describe "http://localhost:#{es_config['http.port']}/_cluster/stats" do
+    subject { shell("curl http://localhost:#{es_config['http.port']}/_cluster/stats") }
+
+    it desc, :with_retries do
+      expect(
+        JSON.parse(subject.stdout)['nodes']['plugins']
+      ).to include(include(val))
     end
   end
 end

spec/helpers/acceptance/tests/security_shared_examples.rb

@@ -56,16 +56,11 @@
     end
   end
 
-  describe server :container do
-    describe http(
-      "https://localhost:#{es_port}#{path}",
-      {
-        ssl: { verify: false }
-      }.merge(user && pass ? { basic_auth: [user, pass] } : {})
-    ) do
-      it test_desc, :with_retries do
-        expect(http_test.call(response)).to eq(expected)
-      end
+  describe "https://localhost:#{es_port}#{path}" do
+    subject { shell("curl -k -u #{user}:#{pass} https://localhost:#{es_port}#{path}") }
+
+    it test_desc, :with_retries do
+      expect(http_test.call(subject.stdout)).to eq(expected)
     end
   end
 end

spec/helpers/acceptance/tests/snapshot_repository_shared_examples.rb

@@ -65,18 +65,16 @@
       end
     end
 
-    describe server :container do
-      describe http(
-        "http://localhost:#{es_port}/_snapshot/backup"
-      ) do
-        it 'returns the snapshot repository', :with_retries do
-          expect(JSON.parse(response.body)['backup']).
-            to include('settings' => a_hash_including(
-              'location' => '/var/lib/elasticsearch/backup',
-              'max_restore_rate' => '20mb',
-              'max_snapshot_rate' => '80mb'
-            ))
-        end
+    describe "http://localhost:#{es_port}/_snapshot/backup" do
+      subject { shell("curl http://localhost:#{es_port}/_snapshot/backup") }
+
+      it 'returns the snapshot repository', :with_retries do
+        expect(JSON.parse(subject.stdout)['backup']).
+          to include('settings' => a_hash_including(
+            'location' => '/var/lib/elasticsearch/backup',
+            'max_restore_rate' => '20mb',
+            'max_snapshot_rate' => '80mb'
+          ))
       end
     end
   end

spec/helpers/acceptance/tests/template_shared_examples.rb

@@ -43,15 +43,12 @@
     end
   end
 
-  describe server :container do
-    describe http(
-      "http://localhost:#{elasticsearch_port}/_template",
-      params: { 'flat_settings' => 'false' }
-    ) do
-      it 'returns the installed template', :with_retries do
-        expect(JSON.parse(response.body).values).
-          to include(include(template))
-      end
+  describe "http://localhost:#{elasticsearch_port}/_template" do
+    subject { shell("curl http://localhost:#{elasticsearch_port}/_template") }
+
+    it 'returns the installed template', :with_retries do
+      expect(JSON.parse(subject.stdout).values).
+        to include(include(template))
     end
   end
 end