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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integ-cli: Skip some unix-specific cli tests #10913

Merged
merged 2 commits into from
Feb 20, 2015
Merged

integ-cli: Skip some unix-specific cli tests #10913

merged 2 commits into from
Feb 20, 2015

Conversation

ahmetb
Copy link
Contributor

@ahmetb ahmetb commented Feb 20, 2015

Skipping some of the tests closely tied to running in a
unix environment. Windows does not support chmod/chown
and this causes some tests to fail creating desired
behavior.

  • TestBuildWithInaccessibleFilesInContext: uses chown/chmod
  • TestBuildDockerfileOutsideContext: uses os.Symlink, not implemented on
    windows
  • TestCpUnprivilegedUser: uses chmod, and requires 'unprivilegeduser'
    created by Dockerfile (and thus requires to run inside container)
  • TestBuildChownSingleFile: uses chown

I wonder if I can write windows equivalents of those using golang
pkg/os calls for windows. Most of them are not implemented, especially
windows-specific security ACLs etc.

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


const (
// idetifies if test suite is running on a unix platform
isUnixCli = false
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, seems like it can be just isUnix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Being more explicit never hurts, does it? :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also at some point I can see us running against windows daemon, so isUnix would probably get refactored to this anyway to clarify what it actually refers to.

Copy link
Contributor

Choose a reason for hiding this comment

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

Was pretty implicit for me actually :P But now I got idea.

@LK4D4
Copy link
Contributor

LK4D4 commented Feb 20, 2015

LGTM

@ahmetb
Copy link
Contributor Author

ahmetb commented Feb 20, 2015

@LK4D4 you made me notice a typo. Can you please re-LGTM? :)

@@ -17,6 +17,10 @@ var (
func() bool { return isLocalDaemon },
"Test requires docker daemon to runs on the same machine as CLI",
}
UnixCli = TestRequirement{
func() bool { return isLocalDaemon },
Copy link
Contributor

Choose a reason for hiding this comment

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

hmmmm isLocalDaemon?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

damn. copypasta is evil.

ahmetb and others added 2 commits February 20, 2015 09:51
Skipping some of the tests closely tied to running in a
unix environment. Windows does not support chmod/chown
and this causes some tests to fail creating desired
behavior.

- `TestBuildWithInaccessibleFilesInContext`: uses chown/chmod
- `TestBuildDockerfileOutsideContext`: uses os.Symlink, not implemented on
  windows
- `TestCpUnprivilegedUser`: uses chmod, and requires 'unprivilegeduser'
  created by Dockerfile (and thus requires to run inside container)
- `TestBuildChownSingleFile`: uses chown

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

LK4D4 commented Feb 20, 2015

LGTM

@jessfraz
Copy link
Contributor

lgtm

jessfraz pushed a commit that referenced this pull request Feb 20, 2015
integ-cli: Skip some unix-specific cli tests
@jessfraz jessfraz merged commit 695bf33 into moby:master Feb 20, 2015
@ahmetb ahmetb deleted the win-cli/UnixSpecific-skip branch February 20, 2015 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants