From 04bb882073f15148c4bd466fd7b1157fac7a5755 Mon Sep 17 00:00:00 2001 From: Tomas Jelinek Date: Fri, 19 May 2017 15:28:21 +0200 Subject: [PATCH] fix tests --- pcsd/test/test_config.rb | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pcsd/test/test_config.rb b/pcsd/test/test_config.rb index 755e35c2..bf75d2b9 100644 --- a/pcsd/test/test_config.rb +++ b/pcsd/test/test_config.rb @@ -122,17 +122,12 @@ class TestConfig < Test::Unit::TestCase ] }' cfg = PCSConfig.new(text) - if JSON::VERSION_MAJOR >= 2 - parser_error = "Unable to parse pcs_settings file: 409: unexpected token at '\"rh71-node2\"\n ]\n }\n ]\n}'" - else - parser_error = "Unable to parse pcs_settings file: 399: unexpected token at '\"rh71-node2\"\n ]\n }\n ]\n}'" - end - assert_equal( - [[ - 'error', - parser_error - ]], - $logger.log + assert_equal(1, $logger.log.length) + assert_equal('error', $logger.log[0][0]) + assert_match( + # the number is based on JSON gem version + /Unable to parse pcs_settings file: \d+: unexpected token/, + $logger.log[0][1] ) assert_equal(fixture_empty_config, cfg.text) end -- 2.11.0