|
 |
956e08 |
From 91d13a82a0803f2a4653a2ec9379a27f4555dcb5 Mon Sep 17 00:00:00 2001
|
|
|
956e08 |
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
|
|
956e08 |
Date: Thu, 8 Dec 2022 22:47:59 +0900
|
|
|
956e08 |
Subject: [PATCH 3/5] pcsd ruby: adjust to json 2.6.3 error message change
|
|
|
956e08 |
|
|
|
956e08 |
json 2.6.3 now removes line number information from parser
|
|
|
956e08 |
error message.
|
|
|
956e08 |
Adjust regex pattern on pcs test code for ruby to support
|
|
|
956e08 |
this error format.
|
|
|
956e08 |
|
|
|
956e08 |
Fixes #606 .
|
|
|
956e08 |
---
|
|
|
956e08 |
pcsd/test/test_config.rb | 4 ++--
|
|
|
956e08 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
956e08 |
|
|
|
956e08 |
diff --git a/pcsd/test/test_config.rb b/pcsd/test/test_config.rb
|
|
|
956e08 |
index 7aaf4349..a580b24f 100644
|
|
|
956e08 |
--- a/pcsd/test/test_config.rb
|
|
|
956e08 |
+++ b/pcsd/test/test_config.rb
|
|
|
956e08 |
@@ -126,7 +126,7 @@ class TestConfig < Test::Unit::TestCase
|
|
|
956e08 |
assert_equal('error', $logger.log[0][0])
|
|
|
956e08 |
assert_match(
|
|
|
956e08 |
# the number is based on JSON gem version
|
|
|
956e08 |
- /Unable to parse pcs_settings file: \d+: unexpected token/,
|
|
|
956e08 |
+ /Unable to parse pcs_settings file: (\d+: )?unexpected token/,
|
|
|
956e08 |
$logger.log[0][1]
|
|
|
956e08 |
)
|
|
|
956e08 |
assert_equal(fixture_empty_config, cfg.text)
|
|
|
956e08 |
@@ -723,7 +723,7 @@ class TestCfgKnownHosts < Test::Unit::TestCase
|
|
|
956e08 |
assert_equal('error', $logger.log[0][0])
|
|
|
956e08 |
assert_match(
|
|
|
956e08 |
# the number is based on JSON gem version
|
|
|
956e08 |
- /Unable to parse known-hosts file: \d+: unexpected token/,
|
|
|
956e08 |
+ /Unable to parse known-hosts file: (\d+: )?unexpected token/,
|
|
|
956e08 |
$logger.log[0][1]
|
|
|
956e08 |
)
|
|
|
956e08 |
assert_empty_data(cfg)
|
|
|
956e08 |
--
|
|
|
956e08 |
2.39.0
|
|
|
956e08 |
|