974575668

Committed 21 Aug 2023 12:04PM UTC coverage: 78.829% (-0.05%) from 78.877%

Build # 974575668

Build Type

push

gitlab-ci

Committed by

kacf

Commit Message

chore: Implement pushing of logs to the server.

Ticket: MEN-6581

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>

Run Details

18 of 18 new or added lines in 2 files covered. (100.0%)

5492 of 6967 relevant lines covered (78.83%)

238.75 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

71.43

/common/testing.hpp

// Copyright 2023 Northern.tech AS
//
//    Licensed under the Apache License, Version 2.0 (the "License");
//    you may not use this file except in compliance with the License.
//    You may obtain a copy of the License at
//
//        http://www.apache.org/licenses/LICENSE-2.0
//
//    Unless required by applicable law or agreed to in writing, software
//    distributed under the License is distributed on an "AS IS" BASIS,
//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//    See the License for the specific language governing permissions and
//    limitations under the License.

#ifndef MENDER_COMMON_TESTING
#define MENDER_COMMON_TESTING

#include <memory>
#include <string>

#include <gtest/gtest.h>

#include <common/events.hpp>
#include <common/http.hpp>

namespace mender {
namespace common {
namespace testing {

using namespace std;

namespace http = mender::http;

shared_ptr<ostream> AssertInDeathTestHelper(const char *func, const char *file, int line);

// For unknown reasons, all test assertion output is disabled inside death test sub processes. It's
// extremely annoying to debug, because all errors will seem to come from the hook that invoked the
// death test sub method, and no additional output is printed. So make our own assert which aborts
// instead. Return a stream so that we can pipe into it as well, like we can with the Googletest
// asserts. Note two things in particular:
//
// 1. The use of an empty block when expression is true. This is to prevent streaming functions from
//    being called in that case, since they may not work then, for example for
//    `ASSERT_IN_DEATH_TEST(expected_reader) << expected_reader.error()`.
//
// 2. The usage of brace-less else. This is so that we can use the rest of the line to stream into
//    the helper without closing it with a brace.
//
#define ASSERT_IN_DEATH_TEST(EXPR) \
        if (EXPR) {                    \
        } else                         \
                *::mender::common::testing::AssertInDeathTestHelper(__PRETTY_FUNCTION__, __FILE__, __LINE__)

class TemporaryDirectory {
public:
        TemporaryDirectory();
        ~TemporaryDirectory();

        std::string Path() const;

        void CreateSubDirectory(const string &dirname);

private:
        std::string path_;
};

// An event loop which automatically times out after a given amount of time.
class TestEventLoop : public mender::common::events::EventLoop {
public:
        TestEventLoop(chrono::seconds seconds = chrono::seconds(5)) :
                timer_ {*this} {
                timer_.AsyncWait(seconds, [this](error::Error err) {
                        Stop();
                        // Better to throw exception than FAIL(), since we want to escape the caller
                        // as well.
                        throw runtime_error("Test timed out");
                });
        }

private:
        mender::common::events::Timer timer_;
};

::testing::AssertionResult FileContains(const string &filename, const string &expected_content);
::testing::AssertionResult FileContainsExactly(
        const string &filename, const string &expected_content);
::testing::AssertionResult FileJsonEquals(const string &filename, const string &expected_content);
::testing::AssertionResult FilesEqual(const string &filename1, const string &filename2);

class RedirectStreamOutputs {
public:
        RedirectStreamOutputs() {
                cout_stream_ = cout.rdbuf(cout_string_.rdbuf());
                cerr_stream_ = cerr.rdbuf(cerr_string_.rdbuf());
        }
        ~RedirectStreamOutputs() {
                cout.rdbuf(cout_stream_);
                cerr.rdbuf(cerr_stream_);
        }

        string GetCout() const {
                return cout_string_.str();
        }

        string GetCerr() const {
                return cerr_string_.str();
        }

private:
        streambuf *cout_stream_;
        streambuf *cerr_stream_;
        stringstream cout_string_;
        stringstream cerr_string_;
};

class HttpFileServer {
public:
        HttpFileServer(const string &dir);
        ~HttpFileServer();

        const string &GetBaseUrl() const {
                return serve_address_;
        }

        void Serve(http::ExpectedIncomingRequestPtr req);

private:
        static const string serve_address_;

        string dir_;
        thread thread_;
        events::EventLoop loop_;
        http::Server server_;
};

} // namespace testing
} // namespace common
} // namespace mender

#endif // MENDER_COMMON_TESTING

1	// Copyright 2023 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	#ifndef MENDER_COMMON_TESTING
16	#define MENDER_COMMON_TESTING
17
18	#include <memory>
19	#include <string>
20
21	#include <gtest/gtest.h>
22
23	#include <common/events.hpp>
24	#include <common/http.hpp>
25
26	namespace mender {
27	namespace common {
28	namespace testing {
29
30	using namespace std;
31
32	namespace http = mender::http;
33
34	shared_ptr<ostream> AssertInDeathTestHelper(const char func, const char file, int line);
35
36	// For unknown reasons, all test assertion output is disabled inside death test sub processes. It's
37	// extremely annoying to debug, because all errors will seem to come from the hook that invoked the
38	// death test sub method, and no additional output is printed. So make our own assert which aborts
39	// instead. Return a stream so that we can pipe into it as well, like we can with the Googletest
40	// asserts. Note two things in particular:
41	//
42	// 1. The use of an empty block when expression is true. This is to prevent streaming functions from
43	// being called in that case, since they may not work then, for example for
44	// `ASSERT_IN_DEATH_TEST(expected_reader) << expected_reader.error()`.
45	//
46	// 2. The usage of brace-less else. This is so that we can use the rest of the line to stream into
47	// the helper without closing it with a brace.
48	//
49	#define ASSERT_IN_DEATH_TEST(EXPR) \
50	if (EXPR) { \
51	} else \
52	*::mender::common::testing::AssertInDeathTestHelper(__PRETTY_FUNCTION__, __FILE__, __LINE__)
53
54	class TemporaryDirectory {
55	public:
56	TemporaryDirectory();
57	~TemporaryDirectory();
58
59	std::string Path() const;
60
61	void CreateSubDirectory(const string &dirname);
62
63	private:
64	std::string path_;
65	};
66
67	// An event loop which automatically times out after a given amount of time.
68	class TestEventLoop : public mender::common::events::EventLoop {
69	public:
70	TestEventLoop(chrono::seconds seconds = chrono::seconds(5)) :	2✔
71	timer_ {*this} {	2✔
72	timer_.AsyncWait(seconds, [this](error::Error err) {	2✔
73	Stop();	×
74	// Better to throw exception than FAIL(), since we want to escape the caller
75	// as well.
76	throw runtime_error("Test timed out");	×
77	});	4✔
78	}	2✔
79
80	private:
81	mender::common::events::Timer timer_;
82	};
83
84	::testing::AssertionResult FileContains(const string &filename, const string &expected_content);
85	::testing::AssertionResult FileContainsExactly(
86	const string &filename, const string &expected_content);
87	::testing::AssertionResult FileJsonEquals(const string &filename, const string &expected_content);
88	::testing::AssertionResult FilesEqual(const string &filename1, const string &filename2);
89
90	class RedirectStreamOutputs {
91	public:
92	RedirectStreamOutputs() {
93	cout_stream_ = cout.rdbuf(cout_string_.rdbuf());
94	cerr_stream_ = cerr.rdbuf(cerr_string_.rdbuf());
95	}
96	~RedirectStreamOutputs() {
97	cout.rdbuf(cout_stream_);
98	cerr.rdbuf(cerr_stream_);
99	}
100
101	string GetCout() const {
102	return cout_string_.str();
103	}
104
105	string GetCerr() const {
106	return cerr_string_.str();
107	}
108
109	private:
110	streambuf *cout_stream_;
111	streambuf *cerr_stream_;
112	stringstream cout_string_;
113	stringstream cerr_string_;
114	};
115
116	class HttpFileServer {
117	public:
118	HttpFileServer(const string &dir);
119	~HttpFileServer();
120
121	const string &GetBaseUrl() const {
122	return serve_address_;
123	}
124
125	void Serve(http::ExpectedIncomingRequestPtr req);
126
127	private:
128	static const string serve_address_;
129
130	string dir_;
131	thread thread_;
132	events::EventLoop loop_;
133	http::Server server_;
134	};
135
136	} // namespace testing
137	} // namespace common
138	} // namespace mender
139
140	#endif // MENDER_COMMON_TESTING

mendersoftware / mender / 974575668

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous