Add and fix tests for typo3-solr:5.0

Author: mblaschke

conf/console.yml

@@ -35,10 +35,6 @@ dockerTest:
   dockerfile:
     '/varnish':
       - 'ENV VARNISH_BACKEND_HOST webdevops.io'
-    '/typo3-solr':
-      - 'USER root'
-      - 'RUN apt-get update && apt-get install -y -f --no-install-recommends lsb-release lsb-base net-tools && apt-get clean -y'
-      - 'USER solr'
 
   configuration:
     default:
@@ -117,10 +113,15 @@ dockerTest:
       '/samson-deployment':
         OS_FAMILY: 'debian'
         OS_VERSION: '8'
-      '/typo3-solr':
-        OS_FAMILY: 'debian'
-        OS_VERSION: '8'
+      '/typo3-solr:5.0':
+        SOLR_VERSION: '4.10.4'
+        OS_FAMILY: 'arch'
+        OS_VERSION: ''
       '/typo3-solr:6.0':
         SOLR_VERSION: '6.3.0'
+        OS_FAMILY: 'debian'
+        OS_VERSION: '8'
       '/typo3-solr:latest':
-        SOLR_VERSION: '6.3.0'
+        OS_FAMILY: 'debian'
+        OS_FAMILY: 'debian'
+        OS_VERSION: '8'

tests/serverspec/spec/shared/typo3-solr/service.rb

@@ -1,6 +1,6 @@
 shared_examples 'typo3-solr::service::running' do
     describe "service solr check" do
-        it "should have running solr daemon", :retry => 20, :retry_wait => 3 do
+        it "should have running solr daemon", :retry => 10, :retry_wait => 3 do
             check_if_service_is_running_stable("java")
         end
     end

tests/serverspec/spec/shared/typo3-solr/test.rb

@@ -1,16 +1,19 @@
 shared_examples 'typo3-solr::test' do
     describe 'solr-system-status' do
-        it 'solr version should be correct', :retry => 20, :retry_wait => 3 do
+        it 'solr version should be correct', :retry => 10, :retry_wait => 3 do
             content = get_url('http://localhost:8983/solr/admin/info/system?wt=json')
             content = JSON.parse(content)
 
-            expect(content['solr_home']).to eql('/opt/solr/server/solr')
+            if content.key?('solr_home')
+                expect(content['solr_home']).to eql('/opt/solr/server/solr')
+            end
+
             expect(content['lucene']['solr-spec-version']).to eql(ENV['SOLR_VERSION'])
         end
     end
 
     describe 'solr-core-status' do
-        it 'solr version should be correct', :retry => 20, :retry_wait => 3 do
+        it 'solr version should be correct', :retry => 10, :retry_wait => 3 do
             content = get_url('http://localhost:8983/solr/admin/cores?indexInfo=false&wt=json')
             content = JSON.parse(content)
 
@@ -33,21 +36,21 @@
                 "core_hu",
                 "core_hy",
                 "core_id",
-                "core_ie",
+                # "core_ie",
                 "core_it",
                 "core_ja",
                 "core_km",
                 "core_ko",
                 "core_lo",
-                "core_lv",
+                # "core_lv",
                 "core_my",
                 "core_nl",
                 "core_no",
                 "core_pl",
                 "core_pt",
                 "core_ptbr",
                 "core_ro",
-                "core_rs",
+                # "core_rs",
                 "core_ru",
                 "core_sv",
                 "core_th",