Merge pull request #1094 from david22swan/MODULES-7353

(MODULES-7353) Enable service for Debian 9

Author: pmcmaw

spec/acceptance/locales_spec.rb

@@ -10,6 +10,14 @@
   end
 
   context 'when triggering puppet simple string error' do
+    # 'service_enabled' being set to false can cause random failures in Debian 9
+    let(:os_variant) do
+      if fact('operatingsystem') =~ %r{Debian} && fact('operatingsystemrelease') =~ %r{^9\.}
+        'true'
+      else
+        'false'
+      end
+    end
     let(:pp) do
       <<-MANIFEST
     class { 'mysql::server':
@@ -24,7 +32,7 @@ class { 'mysql::server':
             root_group              => 'root',
             root_password           => 'test',
             old_root_password       => 'kittensnmittens',
-            service_enabled         => 'false'
+            service_enabled         => '#{os_variant}',
           }
       MANIFEST
     end

spec/acceptance/mysql_server_spec.rb

@@ -50,9 +50,9 @@ class { 'mysql::server':
     before(:all) do
       @tmpdir = default.tmpdir('mysql')
     end
-    # 'manage_config_file' being set to false can cause random failures in Debian 9
-    let(:manage_config_file) do
-      if fact('operatingsystem') == 'Debian' && fact('operatingsystemrelease') == '9'
+    # 'manage_config_file'/'service_enabled' being set to false can cause random failures in Debian 9
+    let(:os_variant) do
+      if fact('operatingsystem') =~ %r{Debian} && fact('operatingsystemrelease') =~ %r{^9\.}
         'true'
       else
         'false'
@@ -61,15 +61,15 @@ class { 'mysql::server':
     let(:pp) do
       <<-MANIFEST
         class { 'mysql::server':
-          manage_config_file      => '#{manage_config_file}',
+          manage_config_file      => '#{os_variant}',
           override_options        => { 'mysqld' => { 'key_buffer_size' => '32M' }},
           package_ensure          => 'present',
           purge_conf_dir          => 'false',
           remove_default_accounts => 'false',
           restart                 => 'false',
           root_group              => 'root',
           root_password           => 'test',
-          service_enabled         => 'false',
+          service_enabled         => '#{os_variant}',
           service_manage          => 'false',
           users                   => {},
           grants                  => {},