From c0980f971a44824903c679ee0238f59d1930fe55 Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Thu, 20 Jun 2019 14:45:38 +0200 Subject: [PATCH] Fixes #27088 - Handle capabilities for uninitialized plugins Signed-off-by: Lukas Zapletal --- modules/root/root_v2_api.rb | 1 + test/bmc/integration_test.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/root/root_v2_api.rb b/modules/root/root_v2_api.rb index 69a35c765..505d96292 100644 --- a/modules/root/root_v2_api.rb +++ b/modules/root/root_v2_api.rb @@ -25,6 +25,7 @@ class Proxy::RootV2Api < Sinatra::Base end def process_capabilities(state, capabilities) + return [] if state == :uninitialized capabilities = capabilities.select { |cap| !cap.is_a?(Proc) || state == :running } capabilities = capabilities.map do |capability| capability.is_a?(Proc) ? capability.call : capability diff --git a/test/bmc/integration_test.rb b/test/bmc/integration_test.rb index 30f5b6c33..35eb1ef9f 100644 --- a/test/bmc/integration_test.rb +++ b/test/bmc/integration_test.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'json' require 'root/root_v2_api' -require 'bmc/bmc' +require 'bmc/bmc_plugin' require 'bmc/ipmi' class BmcApiFeaturesTest < Test::Unit::TestCase