Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

integration-cli: Skip tests which require daemon/cli to be on the same host #10889

Merged
merged 1 commit into from Feb 23, 2015
Merged

integration-cli: Skip tests which require daemon/cli to be on the same host #10889

merged 1 commit into from Feb 23, 2015

Conversation

@ahmetb
Copy link
Contributor

@ahmetb ahmetb commented Feb 19, 2015

Some integration-cli tests assume daemon and cli are running on the same host machine and therefore they examine side effects of executed docker commands on docker host by reading files or running other sort of commands.

In case of windows/darwin CLI tests these provide little or no value to CLI testing and should be OK to skip. There's another set of such tests I haven't skipped in this PR since those might be actually fixable with some workarounds but I think the following tests require daemon and cli to be on the same host machine.

List of skipped tests:

  • TestContainerNetworkMode
  • TestCpVolumePath
  • TestCreateVolumesCreated
  • TestBuildContextCleanup
  • TestBuildContextCleanupFailedBuild
  • TestLinksEtcHostsContentMatch
  • TestRmContainerWithRemovedVolume
  • TestRunModeIpcHost
  • TestRunModeIpcContainer
  • TestRunModePidHost
  • TestRunNetHost
  • TestRunDeallocatePortOnMissingIptablesRule
  • TestRunPortInUse
  • TestRunPortProxy
  • TestRunMountOrdering
  • TestRunModeHostname
  • TestRunDnsDefaultOptions
  • TestRunDnsOptionsBasedOnHostResolvConf
  • TestRunResolvconfUpdater
  • TestRunReuseBindVolumeThatIsSymlink 馃啎
  • TestRunVolumesNotRecreatedOnStart

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @unclejack @tianon @jfrazelle @icecrime @crosbymichael

@@ -374,6 +374,8 @@ func TestCpUnprivilegedUser(t *testing.T) {
}

func TestCpVolumePath(t *testing.T) {
Copy link
Member

@tianon tianon Feb 19, 2015

It seems like only the bind-mounting parts of this are really "same host assuming", but that the rest of the "testing docker cp" logic is not only agnostic of that but would be useful client testing too -- do you think there'd be value in splitting this test instead?

Copy link
Contributor Author

@ahmetb ahmetb Feb 19, 2015

@tianon agreed. but the part you're gonna gain by splitting is what other cp tests like TestCpRelativePath, TestCpAbsolutePath, TestCpToDot are already testing?

Copy link
Member

@tianon tianon Feb 23, 2015

Ah, good point. 馃憤

@tianon
Copy link
Member

@tianon tianon commented Feb 19, 2015

Overall not a totally insane list -- I think some of these can be split up a little to improve our Windows test coverage too, but generally on a reasonable track IMO.

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 20, 2015

SGTM

@LK4D4
Copy link
Contributor

@LK4D4 LK4D4 commented Feb 20, 2015

@tianon what's up here. LGTY?

@tianon
Copy link
Member

@tianon tianon commented Feb 23, 2015

LGTM (although needs a rebase)

Some integration-cli tests assume daemon and cli are running
on the same machine and therefore they examine side effects
of executed docker commands on docker host by reading files
or running other sort of commands.

In case of windows/darwin CLI tests these provide little
or no value and should be OK to skip.

List of skipped tests:
- `TestContainerNetworkMode`
- `TestCpVolumePath`
- `TestCreateVolumesCreated`
- `TestBuildContextCleanup`
- `TestBuildContextCleanupFailedBuild`
- `TestLinksEtcHostsContentMatch`
- `TestRmContainerWithRemovedVolume`
- `TestRunModeIpcHost`
- `TestRunModeIpcContainer`
- `TestRunModePidHost`
- `TestRunNetHost`
- `TestRunDeallocatePortOnMissingIptablesRule`
- `TestRunPortInUse`
- `TestRunPortProxy`
- `TestRunMountOrdering`
- `TestRunModeHostname`
- `TestRunDnsDefaultOptions`
- `TestRunDnsOptionsBasedOnHostResolvConf`
- `TestRunResolvconfUpdater`
- `TestRunVolumesNotRecreatedOnStart`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
@ahmetb
Copy link
Contributor Author

@ahmetb ahmetb commented Feb 23, 2015

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 23, 2015

LGTM

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 23, 2015

waiting on janky ;)

jessfraz pushed a commit that referenced this issue Feb 23, 2015
鈥kips

integration-cli: Skip tests which require daemon/cli to be on the same host
@jessfraz jessfraz merged commit f6100a5 into moby:master Feb 23, 2015
1 check passed
@ahmetb ahmetb deleted the win-cli/SameHostDaemon-skips branch Feb 23, 2015
@ahmetb
Copy link
Contributor Author

@ahmetb ahmetb commented Feb 23, 2015

鉂わ笍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants