Skip to content

migrate service update integration tests from integration-cli to integration/service package#37492

Merged
yongtang merged 1 commit intomoby:masterfrom
adshmh:migrate-docker_cli_service_update_test-to-integration-service
Jul 27, 2018
Merged

migrate service update integration tests from integration-cli to integration/service package#37492
yongtang merged 1 commit intomoby:masterfrom
adshmh:migrate-docker_cli_service_update_test-to-integration-service

Conversation

@adshmh
Copy link
Contributor

@adshmh adshmh commented Jul 18, 2018

- What I did
Refactored and moved service update integration tests from the integration-cli package to integration/service

- How I did it
Removed the integration test file integration-cli//docker_cli_service_update_test.go and added new test file integration/service/update_test.go with corresponding tests.

- How to verify it

- Description for the changelog
Service update integration tests have been moved from integration-cli to integration/service package.

- A picture of a cute animal (not mandatory but encouraged)

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

one minor issue but LGTM otherwise (also left a suggestion of a follow up) 👍

Copy link
Member

Choose a reason for hiding this comment

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

can you add t.Helper() in this function?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for the review. Fixed.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like these would be a good candidate for sub-tests. Could be done as a follow up (at least, I'd prefer it to be done in a separate commit, because currently it's easier to compare/follow the "old" and "new" test 😅)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for the review, I will follow up with a PR to refactor.

Copy link
Member

Choose a reason for hiding this comment

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

This was because it was previously // +build !windows

…rvice_update_test.go to integration/service

Signed-off-by: Arash Deshmeh <[email protected]>
@adshmh adshmh force-pushed the migrate-docker_cli_service_update_test-to-integration-service branch from 2d9231e to fbaef1b Compare July 25, 2018 18:49
@codecov
Copy link

codecov bot commented Jul 25, 2018

Codecov Report

Merging #37492 into master will increase coverage by 0.58%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #37492      +/-   ##
==========================================
+ Coverage   34.95%   35.54%   +0.58%     
==========================================
  Files         610      610              
  Lines       44886    45113     +227     
==========================================
+ Hits        15690    16034     +344     
+ Misses      27077    26915     -162     
- Partials     2119     2164      +45

Copy link
Member

@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 🐯

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

ping @vdemeester

@thaJeztah
Copy link
Member

lol; browser-cache; didn't see your review, vincent 😂

@adshmh
Copy link
Contributor Author

adshmh commented Jul 27, 2018

@thaJeztah I am not sure about this, but I think 2 of the tests may be flaky (don't know the reason yet), as they passed once and failed once (I could not reproduce any failures of those tests locally)

@thaJeztah
Copy link
Member

@adshmh thanks for the heads-up; if you see them fail more, could you open an issue for tracking that flakiness?

@vdemeester
Copy link
Member

Yeah it's definitely flakey 😓 @adshmh I'll prepare a revert in the meantime to get the CI a bit more stable 😅

@adshmh
Copy link
Contributor Author

adshmh commented Jul 28, 2018

I will look into the reason for flakiness and submit the PR again after fixing the flaky tests.

@thaJeztah
Copy link
Member

Thanks @adshmh!

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