blob: ced0b80e83e9e4fd316a8c2116f81b9a1a3c3621 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
From bf6e2ce56abe2a710181f0365a21ca2dafd2a8f5 Mon Sep 17 00:00:00 2001
From: Gregor Jasny <gjasny@googlemail.com>
Date: Fri, 13 Mar 2020 13:16:56 +0100
Subject: [PATCH] core: Skip serialization test if locale is not available
Closes: #345
---
core/tests/raii_locale.h | 15 +++++++++++++++
core/tests/serializer_test.cc | 21 ++++++++++++++-------
2 files changed, 29 insertions(+), 7 deletions(-)
create mode 100644 core/tests/raii_locale.h
diff --git a/core/tests/raii_locale.h b/core/tests/raii_locale.h
new file mode 100644
index 0000000..592d74f
--- /dev/null
+++ b/core/tests/raii_locale.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <locale>
+
+class RAIILocale {
+ public:
+ RAIILocale(const char* name) : savedLocale_(std::locale::classic()) {
+ std::locale::global(std::locale(name));
+ }
+
+ ~RAIILocale() { std::locale::global(savedLocale_); }
+
+ private:
+ const std::locale savedLocale_;
+};
diff --git a/core/tests/serializer_test.cc b/core/tests/serializer_test.cc
index f935a3b..6cb8f0e 100644
--- a/core/tests/serializer_test.cc
+++ b/core/tests/serializer_test.cc
@@ -1,9 +1,13 @@
#include "prometheus/counter.h"
+#include "prometheus/detail/future_std.h"
#include "prometheus/family.h"
#include "prometheus/text_serializer.h"
+#include "raii_locale.h"
+
#include <gmock/gmock.h>
-#include <locale>
+
+#include <memory>
#include <sstream>
namespace prometheus {
@@ -25,15 +29,18 @@ class SerializerTest : public testing::Test {
#ifndef _WIN32
TEST_F(SerializerTest, shouldSerializeLocaleIndependent) {
- // save and change locale
- const std::locale oldLocale = std::locale::classic();
- std::locale::global(std::locale("de_DE.UTF-8"));
+ std::unique_ptr<RAIILocale> localeWithCommaDecimalSeparator;
+
+ // ignore missing locale and skip test if setup fails
+ try {
+ localeWithCommaDecimalSeparator =
+ detail::make_unique<RAIILocale>("de_DE.UTF-8");
+ } catch (std::runtime_error&) {
+ GTEST_SKIP();
+ }
const auto serialized = textSerializer.Serialize(collected);
EXPECT_THAT(serialized, testing::HasSubstr("1.0"));
-
- // restore locale
- std::locale::global(oldLocale);
}
#endif
--
2.28.0
|
