diff --git a/spec/acceptance/mysql_server_spec.rb b/spec/acceptance/00_mysql_server_spec.rb similarity index 99% rename from spec/acceptance/mysql_server_spec.rb rename to spec/acceptance/00_mysql_server_spec.rb index 3248a83c8..e1538bd2d 100644 --- a/spec/acceptance/mysql_server_spec.rb +++ b/spec/acceptance/00_mysql_server_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'spec_helper_acceptance' +export_locales describe 'mysql class' do describe 'advanced config' do @@ -62,7 +63,6 @@ class { '::mysql::server': end it 'can be set' do - export_locales apply_manifest(pp, catch_failures: true) do |r| expect(r.stderr).to be_empty end diff --git a/spec/acceptance/mysql_db_spec.rb b/spec/acceptance/01_mysql_db_spec.rb similarity index 100% rename from spec/acceptance/mysql_db_spec.rb rename to spec/acceptance/01_mysql_db_spec.rb diff --git a/spec/acceptance/mysql_mariadb_spec.rb b/spec/acceptance/02_mysql_mariadb_spec.rb similarity index 100% rename from spec/acceptance/mysql_mariadb_spec.rb rename to spec/acceptance/02_mysql_mariadb_spec.rb diff --git a/spec/acceptance/mysql_task_spec.rb b/spec/acceptance/03_mysql_task_spec.rb similarity index 100% rename from spec/acceptance/mysql_task_spec.rb rename to spec/acceptance/03_mysql_task_spec.rb diff --git a/spec/acceptance/mysql_backup_spec.rb b/spec/acceptance/04_mysql_backup_spec.rb similarity index 98% rename from spec/acceptance/mysql_backup_spec.rb rename to spec/acceptance/04_mysql_backup_spec.rb index f3233f645..34b4e456b 100644 --- a/spec/acceptance/mysql_backup_spec.rb +++ b/spec/acceptance/04_mysql_backup_spec.rb @@ -34,10 +34,6 @@ class { 'mysql::server::backup': end describe 'mysqlbackup.sh', if: Gem::Version.new(mysql_version) < Gem::Version.new('5.7.0') do - before(:all) do - pre_run - end - it 'runs mysqlbackup.sh with no errors' do run_shell('/usr/local/sbin/mysqlbackup.sh') do |r| expect(r.stderr).to eq('') @@ -99,10 +95,6 @@ class { 'mysql::server::backup': end describe 'mysqlbackup.sh', if: Gem::Version.new(mysql_version) < Gem::Version.new('5.7.0') do - before(:all) do - pre_run - end - it 'runs mysqlbackup.sh with no errors without root credentials' do run_shell('HOME=/tmp/dontreadrootcredentials /usr/local/sbin/mysqlbackup.sh') do |r| expect(r.stderr).to eq('') @@ -215,10 +207,6 @@ class { 'mysql::server::backup': end describe 'xtrabackup.sh', if: Gem::Version.new(mysql_version) < Gem::Version.new('5.7.0') && ((os[:family] == 'debian' && os[:release].to_i >= 9) || (os[:family] == 'ubuntu' && os[:release] =~ %r{^16\.04|^18\.04}) || (os[:family] == 'redhat' && os[:release].to_i > 6)) do # rubocop:disable Layout/LineLength - before(:all) do - pre_run - end - it 'runs xtrabackup.sh full backup with no errors' do run_shell('/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/xtrabackups/$(date +%F)_full --backup 2>&1 | tee /tmp/xtrabackup_full.log') do |r| expect(r.exit_code).to be_zero @@ -332,10 +320,6 @@ class { 'mysql::server::backup': end describe 'xtrabackup.sh', if: Gem::Version.new(mysql_version) < Gem::Version.new('5.7.0') && ((os[:family] == 'debian' && os[:release].to_i >= 9) || (os[:family] == 'ubuntu' && os[:release] =~ %r{^16\.04|^18\.04}) || (os[:family] == 'redhat' && os[:release].to_i > 6)) do # rubocop:disable Layout/LineLength - before(:all) do - pre_run - end - it 'runs xtrabackup.sh with no errors' do run_shell('/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/xtrabackups/$(date +%F_%H-%M-%S) --backup 2>&1 | tee /tmp/xtrabackup.log') do |r| expect(r.exit_code).to be_zero diff --git a/spec/acceptance/types/mysql_grant_spec.rb b/spec/acceptance/types/mysql_grant_spec.rb index bb7d60a25..0318a553a 100644 --- a/spec/acceptance/types/mysql_grant_spec.rb +++ b/spec/acceptance/types/mysql_grant_spec.rb @@ -483,8 +483,6 @@ class { 'mysql::server': end describe 'proxy privilieges' do - pre_run - describe 'adding proxy privileges', if: Gem::Version.new(mysql_version) > Gem::Version.new('5.5.0') do pp = <<-MANIFEST mysql_user { 'proxy1@tester': @@ -648,7 +646,6 @@ class { 'mysql::server': end it 'fails with fqdn' do - pre_run unless Gem::Version.new(mysql_version) > Gem::Version.new('5.7.0') result = run_shell('mysql -NBe "SHOW GRANTS FOR test@fqdn.com"', expect_failures: true) expect(result.stderr).to contain(%r{There is no such grant defined for user 'test' on host 'fqdn.com'}) diff --git a/spec/acceptance/types/mysql_user_spec.rb b/spec/acceptance/types/mysql_user_spec.rb index f809a1b3a..5b54b6a42 100644 --- a/spec/acceptance/types/mysql_user_spec.rb +++ b/spec/acceptance/types/mysql_user_spec.rb @@ -64,7 +64,6 @@ class { 'mysql::server': * => $ed25519_opts } end it 'does not have a password', if: (os[:family] != 'sles' && os[:release].to_i == 15) do - pre_run table = if Gem::Version.new(mysql_version) > Gem::Version.new('5.7.0') 'authentication_string' else diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index 2ac5a08e7..2c1071121 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -7,14 +7,11 @@ class LitmusHelper include PuppetLitmus end -def pre_run - LitmusHelper.instance.apply_manifest("class { 'mysql::server': root_password => 'password' }", catch_failures: true) -end - def mysql_version shell_output = LitmusHelper.instance.run_shell('mysql --version', expect_failures: true) if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil? - pre_run + # mysql is not yet installed, so we apply this class to install it + LitmusHelper.instance.apply_manifest('include mysql::server', debug: true, catch_failures: true) shell_output = LitmusHelper.instance.run_shell('mysql --version') raise _('unable to get mysql version') if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil? end