updated mysql_db_spec

Author: lionce

spec/acceptance/nodesets/test.yml

@@ -16,22 +16,4 @@ CONFIG:
   nfs_server: none
   consoleport: 443
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
-#
-#---
-#HOSTS:
-#  redhat5-64-1:
-#    pe_dir:
-#    pe_ver:
-#    pe_upgrade_dir:
-#    pe_upgrade_ver:
-#    hypervisor: vmpooler
-#    platform: el-5-x86_64
-#    packaging_platform: el-5-x86_64
-#    template: redhat-5-x86_64
-#    roles:
-#    - agent
-#    - default
-#CONFIG:
-#  nfs_server: none
-#  consoleport: 443
-#  pooling_api: http://vmpooler.delivery.puppetlabs.net/
+

spec/defines/mysql_db_spec.rb

@@ -29,23 +29,29 @@
         is_expected.to contain_exec('test_db-import').with_refreshonly(true)
       end
 
-      it 'imports sql script on creation if enforcing #refreshonly' do
+      it 'imports sql script on creation' do
         params.merge!('sql' => 'test_sql', 'enforce_sql' => true)
+        #' if enforcing #refreshonly'
         is_expected.to contain_exec('test_db-import').with_refreshonly(false)
-      end
-      it 'imports sql script on creation if enforcing #command' do
-        params.merge!('sql' => 'test_sql', 'enforce_sql' => true)
+        #'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 if enforcing #refreshonly' do
+      it 'imports sql script with custom command on creation ' do
         params.merge!('sql' => 'test_sql', 'enforce_sql' => true, 'import_cat_cmd' => 'zcat')
+        # if enforcing #refreshonly
         is_expected.to contain_exec('test_db-import').with_refreshonly(false)
-      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')
+        # 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']
@@ -55,11 +61,12 @@
       it 'does not create database' do
         params.merge!('ensure' => 'absent', 'host' => 'localhost')
         is_expected.to contain_mysql_database('test_db').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 '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')