removed commented blocks

Author: lionce

spec/acceptance/mysql_backup_spec.rb

@@ -30,8 +30,6 @@ class { 'mysql::server::backup':
     MANIFEST
     it 'when configuring mysql backups' do
       idempotent_apply(default, pp, {})
-      # execute_manifest(pp, catch_failures: true)
-      # execute_manifest(pp, catch_failures: true)
     end
   end
 
@@ -106,8 +104,6 @@ class { 'mysql::server::backup':
       MANIFEST
       it 'when configuring mysql backups' do
         idempotent_apply(default, pp, {})
-        # execute_manifest(pp, catch_failures: true)
-        # execute_manifest(pp, catch_failures: true)
       end
     end
 

spec/acceptance/nodesets/test.yml

@@ -2,7 +2,6 @@
 
 describe 'mysql::client' do
   on_supported_os.each do |os, facts|
-    # next if facts[:osfamily] == 'Archlinux'
     context "on #{os}" do
       let(:facts) do
         facts.merge(root_home: '/root')

spec/classes/mysql_client_spec.rb

@@ -37,10 +37,6 @@
         # 'if enforcing #command'
         is_expected.to contain_exec('test_db-import').with_command('cat test_sql | mysql test_db')
       end
-      # it 'imports sql script on creation if enforcing #command' do
-      #   params.merge!('sql' => 'test_sql', 'enforce_sql' => true)
-      #   is_expected.to contain_exec('test_db-import').with_command('cat test_sql | mysql test_db')
-      # end
 
       it 'imports sql script with custom command on creation ' do
         params.merge!('sql' => 'test_sql', 'enforce_sql' => true, 'import_cat_cmd' => 'zcat')
@@ -49,10 +45,6 @@
         # if enforcing #command
         is_expected.to contain_exec('test_db-import').with_command('zcat test_sql | mysql test_db')
       end
-      # it 'imports sql script with custom command on creation if enforcing #command' do
-      #   params.merge!('sql' => 'test_sql', 'enforce_sql' => true, 'import_cat_cmd' => 'zcat')
-      #   is_expected.to contain_exec('test_db-import').with_command('zcat test_sql | mysql test_db')
-      # end
 
       it 'imports sql scripts when more than one is specified' do
         params['sql'] = ['test_sql', 'test_2_sql']
@@ -64,10 +56,6 @@
         is_expected.to contain_mysql_database('test_db').with_ensure('absent')
         is_expected.to contain_mysql_user('testuser@localhost').with_ensure('absent')
       end
-      # it 'does not create database user' do
-      #   params.merge!('ensure' => 'absent', 'host' => 'localhost')
-      #   is_expected.to contain_mysql_user('testuser@localhost').with_ensure('absent')
-      # end
 
       it 'creates with an appropriate collate and charset' do
         params.merge!('charset' => 'utf8', 'collate' => 'utf8_danish_ci')

spec/defines/mysql_db_spec.rb

@@ -43,27 +43,6 @@ def idempotent_apply(hosts, manifest, opts = {}, &block)
   # Configure all nodes in nodeset
   c.before :suite do
     run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
-    # hosts.each do |host|
-    # # This will be removed, this is temporary to test localisation.
-    # if (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') &&
-    #    (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5') &&
-    #     Gem::Version.new(puppet_version) < Gem::Version.new('5.2.0'))
-    #   on(host, 'mkdir /opt/puppetlabs/puppet/share/locale/ja')
-    #   on(host, 'touch /opt/puppetlabs/puppet/share/locale/ja/puppet.po')
-    # end
-    # if fact('osfamily') == 'Debian'
-    #   # install language on debian systems
-    #   install_language_on(host, 'ja_JP.utf-8') if not_controller(host)
-    #   # This will be removed, this is temporary to test localisation.
-    # end
-    # # Required for binding tests.
-    # if fact('osfamily') == 'RedHat'
-    #   if fact('operatingsystemmajrelease') =~ %r{7} || fact('operatingsystem') =~ %r{Fedora}
-    #     shell('yum install -y bzip2')
-    #   end
-    # end
-    # on host, puppet('module', 'install', 'stahnma/epel')
-    # end
   end
 end
 

spec/spec_helper_acceptance.rb

@@ -18,7 +18,6 @@
     context 'node with lo only' do
       before :each do
         Facter.fact(:macaddress).stubs(:value).returns('00:00:00:00:00:00')
-        Facter.fact(:macaddress).stubs(:value).returns('00:00:00:00:00:00')
       end
       it do
         Facter.fact(:mysql_server_id).value.to_s.should == '0'

spec/unit/facter/mysql_server_id_spec.rb

@@ -8,8 +8,7 @@
   describe 'mysql_version' do
     context 'with value' do
       before :each do
-
-        #Facter::Util::Resolution.stubs(:exec).with('mysql --version').returns('mysql  Ver 14.12 Distrib 5.0.95, for redhat-linux-gnu (x86_64) using readline 5.1')
+        Facter::Util::Resolution.stubs(:exec).with('mysql --version').returns('mysql  Ver 14.12 Distrib 5.0.95, for redhat-linux-gnu (x86_64) using readline 5.1')
       end
       it {
         expect(Facter.fact(:mysql_version).value).to eq('5.0.95')