Skip to content

Commit 1889ae3

Browse files
committed
updated ysql_backup spec
1 parent 63c43aa commit 1889ae3

File tree

3 files changed

+37
-83
lines changed

3 files changed

+37
-83
lines changed

spec/acceptance/mysql_backup_spec.rb

-46
Original file line numberDiff line numberDiff line change
@@ -155,50 +155,4 @@ class { 'mysql::server::backup':
155155
# rubocop:enable RSpec/MultipleExpectations, RSpec/ExampleLength
156156
end
157157
end
158-
159-
context 'with triggers and routines' do
160-
pre_run
161-
pp = <<-MANIFEST
162-
class { 'mysql::server': root_password => 'password' }
163-
mysql::db { [
164-
'backup1',
165-
'backup2'
166-
]:
167-
user => 'backup',
168-
password => 'secret',
169-
}
170-
package { 'bzip2':
171-
ensure => present,
172-
}
173-
class { 'mysql::server::backup':
174-
backupuser => 'myuser',
175-
backuppassword => 'mypassword',
176-
backupdir => '/tmp/backups',
177-
backupcompress => true,
178-
file_per_database => true,
179-
include_triggers => #{version_is_greater_than('5.1.5')},
180-
include_routines => true,
181-
postscript => [
182-
'rm -rf /var/tmp/mysqlbackups',
183-
'rm -f /var/tmp/mysqlbackups.done',
184-
'cp -r /tmp/backups /var/tmp/mysqlbackups',
185-
'touch /var/tmp/mysqlbackups.done',
186-
],
187-
execpath => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin',
188-
require => Package['bzip2'],
189-
}
190-
MANIFEST
191-
it 'when configuring mysql backups with triggers and routines' do
192-
execute_manifest(pp, catch_failures: true)
193-
end
194-
195-
it 'runs mysqlbackup.sh with no errors' do
196-
pre_run
197-
unless version_is_greater_than('5.7.0')
198-
shell('/usr/local/sbin/mysqlbackup.sh') do |r|
199-
expect(r.stderr).to eq('')
200-
end
201-
end
202-
end
203-
end
204158
end
+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# require 'spec_helper'
2-
#
3-
# describe Facter::Util::Fact.to_s do
4-
# before(:each) do
5-
# Facter.clear
6-
# end
7-
#
8-
# describe 'mysql_version' do
9-
# context 'with value' do
10-
# before :each do
11-
#
12-
# #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')
13-
# end
14-
# it {
15-
# expect(Facter.fact(:mysql_version).value).to eq('5.0.95')
16-
# }
17-
# end
18-
# end
19-
# end
1+
require 'spec_helper'
2+
3+
describe Facter::Util::Fact.to_s do
4+
before(:each) do
5+
Facter.clear
6+
end
7+
8+
describe 'mysql_version' do
9+
context 'with value' do
10+
before :each do
11+
12+
#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')
13+
end
14+
it {
15+
expect(Facter.fact(:mysql_version).value).to eq('5.0.95')
16+
}
17+
end
18+
end
19+
end
+18-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# require 'spec_helper'
2-
#
3-
# describe Facter::Util::Fact.to_s do
4-
# before(:each) do
5-
# Facter.clear
6-
# end
7-
#
8-
# describe 'mysqld_version' do
9-
# context 'with value' do
10-
# before :each do
11-
# Facter::Util::Resolution.stubs(:exec).with('mysqld --no-defaults -V 2>/dev/null').returns('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)')
12-
# end
13-
# it {
14-
# expect(Facter.fact(:mysqld_version).value).to eq('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)')
15-
# }
16-
# end
17-
# end
18-
# end
1+
require 'spec_helper'
2+
3+
describe Facter::Util::Fact.to_s do
4+
before(:each) do
5+
Facter.clear
6+
end
7+
8+
describe 'mysqld_version' do
9+
context 'with value' do
10+
before :each do
11+
Facter::Util::Resolution.stubs(:exec).with('mysqld --no-defaults -V 2>/dev/null').returns('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)')
12+
end
13+
it {
14+
expect(Facter.fact(:mysqld_version).value).to eq('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)')
15+
}
16+
end
17+
end
18+
end

0 commit comments

Comments
 (0)