Merge pull request #13594 from nik9000/fix_centos_6

Fix centos-6 tests
This commit is contained in:
Nik Everett 2015-09-16 10:00:31 -04:00
commit 26dfe311ec
1 changed files with 3 additions and 2 deletions

View File

@ -40,12 +40,13 @@ setup() {
@test "[INIT.D] remove any leftover configuration to start elasticsearch on restart" { @test "[INIT.D] remove any leftover configuration to start elasticsearch on restart" {
# This configuration can be added with a command like: # This configuration can be added with a command like:
# $ sudo update-rc.d elasticsearch defaults 95 10 # $ sudo update-rc.d elasticsearch defaults 95 10
# but we want to test that the RPM _doesn't_ add it on its own. # but we want to test that the RPM and deb _don't_ add it on its own.
# Note that it'd be incorrect to use: # Note that it'd be incorrect to use:
# $ sudo update-rc.d elasticsearch disable # $ sudo update-rc.d elasticsearch disable
# here because that'd prevent elasticsearch from installing the symlinks # here because that'd prevent elasticsearch from installing the symlinks
# that cause it to be started on restart. # that cause it to be started on restart.
sudo update-rc.d -f elasticsearch remove sudo update-rc.d -f elasticsearch remove || true
sudo chkconfig elasticsearch off || true
} }
@test "[INIT.D] install elasticsearch" { @test "[INIT.D] install elasticsearch" {