From b31ef0d8d6316ae32ef45e9e7e077e59828d1e39 Mon Sep 17 00:00:00 2001
From: sheena <sheena@puppet.com>
Date: Mon, 6 Sep 2021 12:10:34 +0100
Subject: [PATCH] (FM-8483) reenable the testcases

---
 spec/acceptance/apache_parameters_spec.rb |  6 +++---
 spec/acceptance/class_spec.rb             |  4 ++--
 spec/acceptance/default_mods_spec.rb      |  8 ++++----
 spec/acceptance/itk_spec.rb               |  2 +-
 spec/acceptance/prefork_worker_spec.rb    |  6 +++---
 spec/acceptance/vhost_spec.rb             | 18 +++++++++---------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
index cfad4f5faf..6a06d24e37 100644
--- a/spec/acceptance/apache_parameters_spec.rb
+++ b/spec/acceptance/apache_parameters_spec.rb
@@ -53,7 +53,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -70,7 +70,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
       it { is_expected.not_to be_enabled }
     end
@@ -88,7 +88,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
       it { is_expected.not_to be_enabled }
     end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 3a204e5fe2..8ef6f09f19 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -28,7 +28,7 @@
       it { is_expected.to be_installed }
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -77,7 +77,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
diff --git a/spec/acceptance/default_mods_spec.rb b/spec/acceptance/default_mods_spec.rb
index 8653aafd59..fa5a6beabe 100644
--- a/spec/acceptance/default_mods_spec.rb
+++ b/spec/acceptance/default_mods_spec.rb
@@ -17,7 +17,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
   end
@@ -56,7 +56,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.not_to be_running }
     end
   end
@@ -89,7 +89,7 @@ class { 'apache':
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
   end
@@ -108,7 +108,7 @@ class { 'apache': default_mods => false }
       idempotent_apply(pp)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
     end
 
diff --git a/spec/acceptance/itk_spec.rb b/spec/acceptance/itk_spec.rb
index 2283e00b01..c5ef34b9c4 100644
--- a/spec/acceptance/itk_spec.rb
+++ b/spec/acceptance/itk_spec.rb
@@ -43,7 +43,7 @@ class { 'apache':
     end
   end
 
-  describe service(service_name), skip: 'FM-8483' do
+  describe service(service_name) do
     it { is_expected.to be_running }
     it { is_expected.to be_enabled }
   end
diff --git a/spec/acceptance/prefork_worker_spec.rb b/spec/acceptance/prefork_worker_spec.rb
index d6bc2239f7..8cf1fcd657 100644
--- a/spec/acceptance/prefork_worker_spec.rb
+++ b/spec/acceptance/prefork_worker_spec.rb
@@ -18,7 +18,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -39,7 +39,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
@@ -61,7 +61,7 @@ class { 'apache':
       end
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_running }
       it { is_expected.to be_enabled }
     end
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
index 2b74bdb70e..09218c9612 100644
--- a/spec/acceptance/vhost_spec.rb
+++ b/spec/acceptance/vhost_spec.rb
@@ -179,7 +179,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -247,7 +247,7 @@ class { 'apache':
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -307,7 +307,7 @@ class { 'apache': }
         apply_manifest(pp, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -369,7 +369,7 @@ class { 'apache': }
         apply_manifest(pp_one, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -411,7 +411,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
       end
@@ -487,7 +487,7 @@ class { 'apache': }
         apply_manifest(pp_two, catch_failures: true)
       end
 
-      describe service(apache_hash['service_name']), skip: 'FM-8483' do
+      describe service(apache_hash['service_name']) do
         it { is_expected.to be_enabled }
         it { is_expected.to be_running }
 
@@ -528,7 +528,7 @@ class { 'apache': }
       apply_manifest(pp, catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -574,7 +574,7 @@ class { 'apache': default_vhost => false, }
                      ), catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -619,7 +619,7 @@ class { 'apache': default_vhost => false, }
                     ), catch_failures: true)
     end
 
-    describe service(apache_hash['service_name']), skip: 'FM-8483' do
+    describe service(apache_hash['service_name']) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end