FM-7783 cleanup mysql

Author: Lavinia-Dan

spec/acceptance/types/mysql_database_spec.rb

@@ -44,8 +44,7 @@ class { 'mysql::server': }
         }
     MANIFEST
     it 'creates two db of different types idempotently' do
-      execute_manifest(pp, catch_failures: true)
-      execute_manifest(pp, catch_changes: true)
+      idempotent_apply(default, pp, {})
     end
 
     it 'finds latin1 db #stdout' do

spec/spec_helper_acceptance.rb

@@ -16,6 +16,20 @@
 install_module_on(hosts)
 install_module_dependencies_on(hosts)
 
+def idempotent_apply(hosts, manifest, opts = {}, &block)
+  block_on hosts, opts do |host|
+    file_path = host.tmpfile('apply_manifest.pp')
+    create_remote_file(host, file_path, manifest + "\n")
+
+    puppet_apply_opts = { :verbose => nil, 'detailed-exitcodes' => nil }
+    on_options = { acceptable_exit_codes: [0, 2] }
+    on host, puppet('apply', file_path, puppet_apply_opts), on_options, &block
+    puppet_apply_opts2 = { :verbose => nil, 'detailed-exitcodes' => nil }
+    on_options2 = { acceptable_exit_codes: [0] }
+    on host, puppet('apply', file_path, puppet_apply_opts2), on_options2, &block
+  end
+end
+
 RSpec.configure do |c|
   # Readable test descriptions
   c.formatter = :documentation

spec/unit/puppet/type/mysql_user_spec.rb

@@ -125,4 +125,12 @@
       }.to raise_error %r{Invalid database user "misquoted@localhost}
     end
   end
+
+  context 'using invalid options' do
+    it 'fails with an invalid option' do
+      expect {
+        Puppet::Type.type(:mysql_user).new(name: 'misquoted@localhost', password_hash: 'pass', tls_options: ['SOMETHING_ELSE'])
+      }.to raise_error %r{Invalid tls option}
+    end
+  end
 end