Skip to content

[18.09] backport getEngineConfigFilePath is only used during test so moving it in test files for now.#1373

Merged
silvin-lubecki merged 1 commit into
docker:18.09from
thaJeztah:18.09_backport_move_test_function_in_there
Sep 14, 2018
Merged

[18.09] backport getEngineConfigFilePath is only used during test so moving it in test files for now.#1373
silvin-lubecki merged 1 commit into
docker:18.09from
thaJeztah:18.09_backport_move_test_function_in_there

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Backport of #1304 for 18.09

git checkout -b 18.09_backport_move_test_function_in_there upstream/18.09
git cherry-pick -s -S -x 37ca5d681372c5af4a2442de512643ad827b13e9 

cherry-pick was clean; no conflicts

… so moving it in test files for now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 37ca5d6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.09.0 milestone Sep 14, 2018
Copy link
Copy Markdown
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #1373 into 18.09 will decrease coverage by 0.03%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##            18.09    #1373      +/-   ##
==========================================
- Coverage   54.59%   54.55%   -0.04%     
==========================================
  Files         294      294              
  Lines       19419    19401      -18     
==========================================
- Hits        10601    10585      -16     
+ Misses       8153     8152       -1     
+ Partials      665      664       -1

Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki silvin-lubecki merged commit 3b991ec into docker:18.09 Sep 14, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_move_test_function_in_there branch September 14, 2018 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants