Skip to content

Commit 74e1969

Browse files
author
Morgan Haskel
committed
Merge pull request #650 from cmurphy/fix_fix_tests
Fix acceptance tests from #648
2 parents d5defe2 + 551d22f commit 74e1969

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

spec/acceptance/types/mysql_plugin_spec.rb

+5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@
2424
plugin_lib = 'ha_example.so'
2525
end
2626
elsif fact('operatingsystem') =~ /Ubuntu/
27+
if fact('operatingsystemrelease') =~ /^10\.04/
28+
# Only available plugin is innodb which is already loaded and not unload- or reload-able
29+
plugin = nil
30+
else
2731
plugin = 'example'
2832
plugin_lib = 'ha_example.so'
33+
end
2934
end
3035
elsif fact('osfamily') =~ /Suse/
3136
plugin = nil # Plugin library path is broken on Suse http://lists.opensuse.org/opensuse-bugs/2013-08/msg01123.html

0 commit comments

Comments
 (0)