test: Break down huge monolith mock header to improve test compilation performance by foreseeable · Pull Request #11797 · envoyproxy/envoy

foreseeable · 2020-06-29T14:27:11Z

Commit Message: breakdown test/mocks/server/mocks.h into different mock classes
Additional Description: test/mocks/server/mocks.h is a wide-used mock header included by various test files. However it's very huge and most test files only used a small portion of it. Splitting it up into different mock classes will be helpful to reduce compilation time.
Risk Level: low
Testing: existing tests
Docs Changes: N/A
Release Notes: no
Related Issues: #10917

Signed-off-by: Muge Chen <mugechen@google.com>

foreseeable · 2020-06-29T14:42:49Z

@ahedberg

ahedberg · 2020-06-29T18:55:42Z

test/mocks/server/drain_manager.cc

+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+using testing::_;


As I mentioned on the last PR, these should be fully-qualified and inside the innermost working namespace, or removed if not being used.

Thanks for let me know, now they should be fully qualified and stay inside the innermost namespace.

ahedberg · 2020-06-29T18:56:38Z

test/mocks/server/bootstrap_extension_factory.h

+  MOCK_METHOD(std::string, name, (), (const, override));
+};
+} // namespace Configuration
+


Removing the blank lines between closing namespace brackets would be more consistent with the opening namespace brackets.

Now they're removed

Signed-off-by: Muge Chen <mugechen@google.com>

ahedberg · 2020-06-30T18:24:47Z

test/mocks/server/admin_stream.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <chrono>


Are we scripting the removal of extra #includes or doing it manually? We don't need most of these system headers in the new headers.

I remove them manually, just forget to remove them. Thanks for pointing out

ahedberg · 2020-06-30T18:26:14Z

test/mocks/server/mocks.cc

-} // namespace Configuration
-} // namespace Server
-} // namespace Envoy
+namespace Envoy {}


We can delete the .cc file.

ahedberg · 2020-06-30T18:26:39Z

test/mocks/server/mocks.h

+#include "worker.h"
+#include "worker_factory.h"
+
+namespace Envoy {}


This empty namespace block can be removed.

Signed-off-by: Muge Chen <mugechen@google.com>

ahedberg

Please fix formatting. ./ci/run_envoy_docker.sh './ci/do_ci.sh fix_format' should do it.

Signed-off-by: Muge Chen <mugechen@google.com>

foreseeable · 2020-06-30T21:01:32Z

cc @ahedberg

Please fix formatting. ./ci/run_envoy_docker.sh './ci/do_ci.sh fix_format' should do it.

Now it should be fixed. Actually the empty namespace block in mocks.h from previous commits was used to make the formatter happy. now I found I can use no lint instead

Signed-off-by: Muge Chen <mugechen@google.com>

… up test compilation (#12048) breakdown test/mocks/upstream/mocks.h into different mock classes test/mocks/upstream/mocks.h is a wide-used mock header included by various test files. However it's very huge and most test files only used a small portion of it. Splitting it up into different mock classes will be helpful to reduce compilation time. (similar to #11797 ) Risk Level: low Testing: existing tests Docs Changes: N/A Release Notes: no Related Issues: #10917 Signed-off-by: Muge Chen <mugechen@google.com>

… up test compilation (envoyproxy#12048) breakdown test/mocks/upstream/mocks.h into different mock classes test/mocks/upstream/mocks.h is a wide-used mock header included by various test files. However it's very huge and most test files only used a small portion of it. Splitting it up into different mock classes will be helpful to reduce compilation time. (similar to envoyproxy#11797 ) Risk Level: low Testing: existing tests Docs Changes: N/A Release Notes: no Related Issues: envoyproxy#10917 Signed-off-by: Muge Chen <mugechen@google.com> Signed-off-by: Kevin Baichoo <kbaichoo@google.com>

…n performance (envoyproxy#11797) Commit Message: breakdown `test/mocks/server/mocks.h` into different mock classes Additional Description: `test/mocks/server/mocks.h` is a wide-used mock header included by various test files. However it's very huge and most test files only used a small portion of it. Splitting it up into different mock classes will be helpful to reduce compilation time. Risk Level: low Testing: existing tests Docs Changes: N/A Release Notes: no Related Issues: envoyproxy#10917 Signed-off-by: Muge Chen <mugechen@google.com> Signed-off-by: scheler <santosh.cheler@appdynamics.com>

… up test compilation (envoyproxy#12048) breakdown test/mocks/upstream/mocks.h into different mock classes test/mocks/upstream/mocks.h is a wide-used mock header included by various test files. However it's very huge and most test files only used a small portion of it. Splitting it up into different mock classes will be helpful to reduce compilation time. (similar to envoyproxy#11797 ) Risk Level: low Testing: existing tests Docs Changes: N/A Release Notes: no Related Issues: envoyproxy#10917 Signed-off-by: Muge Chen <mugechen@google.com> Signed-off-by: chaoqinli <chaoqinli@google.com>

We need to reduce resource consumption of test compilation by simplifying mock library inclusions. #10917 One way to do that is to break the monolithic mock headers into different mock classes and then refactor the code base (like #12053 #12051 #11797) It's hard to refactor them manually. So I wrote headersplit, a tool based on libclang and python to help me divide the monolithic mock header and replace includes after dividing automatically. This tool can also generate building time comparison between before/after refactoring. Risk level: low Testing: Build succeeds. Signed-off-by: Muge Chen <mugechen@google.com>

) We need to reduce resource consumption of test compilation by simplifying mock library inclusions. envoyproxy#10917 One way to do that is to break the monolithic mock headers into different mock classes and then refactor the code base (like envoyproxy#12053 envoyproxy#12051 envoyproxy#11797) It's hard to refactor them manually. So I wrote headersplit, a tool based on libclang and python to help me divide the monolithic mock header and replace includes after dividing automatically. This tool can also generate building time comparison between before/after refactoring. Risk level: low Testing: Build succeeds. Signed-off-by: Muge Chen <mugechen@google.com> Signed-off-by: Clara Andrew-Wani <candrewwani@gmail.com>

foreseeable added 4 commits June 29, 2020 04:47

added splitted up mock headers

2989186

Signed-off-by: Muge Chen <mugechen@google.com>

fix dependency issues

e3c12fa

Signed-off-by: Muge Chen <mugechen@google.com>

fix duplicate symbol error

ba1be16

Signed-off-by: Muge Chen <mugechen@google.com>

fix format

e022b74

Signed-off-by: Muge Chen <mugechen@google.com>

ahedberg suggested changes Jun 29, 2020

View reviewed changes

foreseeable added 3 commits June 30, 2020 01:59

move the using into inner namespace and make them fully qualified

f2825fb

Signed-off-by: Muge Chen <mugechen@google.com>

remove blank lines between closing namespace brackets

38c5e14

Signed-off-by: Muge Chen <mugechen@google.com>

remove blank lines between closing namespace bracets

af2db9d

Signed-off-by: Muge Chen <mugechen@google.com>

mattklein123 assigned ahedberg Jun 30, 2020

ahedberg reviewed Jun 30, 2020

View reviewed changes

ahedberg suggested changes Jun 30, 2020

View reviewed changes

remove unused std libs

f98507e

Signed-off-by: Muge Chen <mugechen@google.com>

ahedberg suggested changes Jun 30, 2020

View reviewed changes

run the formatter and add no lint to mocks.h

93dadb5

Signed-off-by: Muge Chen <mugechen@google.com>

foreseeable added 8 commits July 1, 2020 02:58

merge upstream test file to pass ci

a7cea47

Signed-off-by: Muge Chen <mugechen@google.com>

merge upstream changes to pass ci

a1668a3

Signed-off-by: Muge Chen <mugechen@google.com>

remove unused using statement

3807f54

Signed-off-by: Muge Chen <mugechen@google.com>

resolve conflicts

517ab02

Signed-off-by: Muge Chen <mugechen@google.com>

resolve changes

13084f4

Signed-off-by: Muge Chen <mugechen@google.com>

resolve conflicts

f07736f

Signed-off-by: Muge Chen <mugechen@google.com>

remove unused using statements

e1e8aca

Signed-off-by: Muge Chen <mugechen@google.com>

Kick CI

df9a803

Signed-off-by: Muge Chen <mugechen@google.com>

ahedberg approved these changes Jul 6, 2020

View reviewed changes

ggreenway assigned lizan Jul 6, 2020

lizan approved these changes Jul 6, 2020

View reviewed changes

lizan merged commit 7d5e12c into envoyproxy:master Jul 6, 2020

This was referenced Jul 9, 2020

Reduce resource consumption of test compilation by simplifying mock library inclusions #10917

Closed

test: Split huge monolith mock header(test/upstream/mocks.h) to speed up test compilation #12048

Merged

foreseeable mentioned this pull request Jul 17, 2020

tools/test: adding tools for splitting up mock headers #12150

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: Break down huge monolith mock header to improve test compilation performance#11797

test: Break down huge monolith mock header to improve test compilation performance#11797
lizan merged 17 commits intoenvoyproxy:masterfrom
foreseeable:split_server_mocks

foreseeable commented Jun 29, 2020

Uh oh!

foreseeable commented Jun 29, 2020

Uh oh!

ahedberg Jun 29, 2020

Uh oh!

foreseeable Jun 30, 2020

Uh oh!

ahedberg Jun 29, 2020

Uh oh!

foreseeable Jun 30, 2020

Uh oh!

ahedberg Jun 30, 2020

Uh oh!

foreseeable Jun 30, 2020

Uh oh!

ahedberg Jun 30, 2020

Uh oh!

ahedberg Jun 30, 2020

Uh oh!

ahedberg left a comment

Uh oh!

foreseeable commented Jun 30, 2020 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

foreseeable commented Jun 29, 2020

Uh oh!

foreseeable commented Jun 29, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ahedberg left a comment

Choose a reason for hiding this comment

Uh oh!

foreseeable commented Jun 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

foreseeable commented Jun 30, 2020 •

edited

Loading