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: use httpserver container for fakeGIT #11278

Merged
merged 1 commit into from Mar 12, 2015
Merged

integ-cli: use httpserver container for fakeGIT #11278

merged 1 commit into from Mar 12, 2015

Conversation

@ahmetb
Copy link
Contributor

@ahmetb ahmetb commented Mar 10, 2015

This change enables fakeGIT() to use the new fakeStorage() server (#10893)
which is automatically starting a container on the remote test daemon machine
using the git repo directory.

Fixes the following tests:

  • TestBuildApiLowerDockerfile
  • TestBuildApiBuildGitWithF
  • TestBuildApiDoubleDockerfile (skipped on windows: NTFS case-insensitive)
  • TestBuildWithGIT (requires local http server)

These tests are currently failing because we're starting the fakeGIT server on
the same host with the CLI; not the test daemon.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com

@LK4D4
Copy link
Contributor

@LK4D4 LK4D4 commented Mar 10, 2015

@ahmetalpbalkan What's with windows build? Why library/httpserver is not found?

@ahmetb
Copy link
Contributor Author

@ahmetb ahmetb commented Mar 10, 2015

@LK4D4 it happens when .ensure-httpserver fails, most likely go compiler wasn't bootstrapped for linux/amd64 on the windows CI machine back then. looks better now?

This change enables `fakeGIT()` to use the new `fakeStorage`
server which is automatically starting a container on the remote test
daemon machine using the git repo directory (when requested).

Fixes the following tests:

- `TestBuildApiLowerDockerfile`
- `TestBuildApiBuildGitWithF`
- `TestBuildApiDoubleDockerfile` (skipped on windows: NTFS case-insensitive)
- `TestBuildFromGIT` (still needs local server)

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

@ahmetb ahmetb commented Mar 11, 2015

@tiborvass
Copy link
Collaborator

@tiborvass tiborvass commented Mar 11, 2015

LGTM

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Mar 11, 2015

still see

--- FAIL: TestBuildApiLowerDockerfile (0.14s)
    docker_api_containers_test.go:390: error trying to add files to repo: exit status 128 (fatal: pathspec '*' did not match any files
        )
=== RUN TestBuildApiBuildGitWithF
--- FAIL: TestBuildApiBuildGitWithF (0.17s)
    docker_api_containers_test.go:415: error trying to add files to repo: exit status 128 (fatal: pathspec '*' did not match any files
        )

https://jenkins.dockerproject.com/job/Windows-PRs/120/console

@ahmetb
Copy link
Contributor Author

@ahmetb ahmetb commented Mar 12, 2015

@jfrazelle aware. I cannot repro locally 😞

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Mar 12, 2015

ya im trying hehe

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Mar 12, 2015

probably because * is intepreted weirdly by sh maybe @tianon has ideas

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Mar 12, 2015

i figured it out, effing sh version

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Mar 12, 2015

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Mar 12, 2015

=== RUN TestBuildApiLowerDockerfile
[PASSED]: container REST API - check build with lower dockerfile
--- PASS: TestBuildApiLowerDockerfile (29.99s)
=== RUN TestBuildApiBuildGitWithF
[PASSED]: container REST API - check build from git w/F
--- PASS: TestBuildApiBuildGitWithF (27.05s)
=== RUN TestBuildApiDoubleDockerfile
--- SKIP: TestBuildApiDoubleDockerfile (0.00s)
    requirements.go:87: Test requires posix utilities or functionality to run.
=== RUN TestBuildApiDockerfileSymlink
[PASSED]: container REST API - check build w/bad Dockerfile symlink path
--- PASS: TestBuildApiDockerfileSymlink (0.12s)

jessfraz pushed a commit that referenced this issue Mar 12, 2015
integ-cli: use httpserver container for fakeGIT
@jessfraz jessfraz merged commit 52f6da2 into moby:master Mar 12, 2015
1 of 2 checks passed
@ahmetb
Copy link
Contributor Author

@ahmetb ahmetb commented Mar 12, 2015

Wow how did that happen @jfrazelle

@ahmetb ahmetb deleted the win-cli/fakeGIT branch Mar 12, 2015
@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Mar 12, 2015

i blame clippy

On Wed, Mar 11, 2015 at 6:41 PM, Ahmet Alp Balkan notifications@github.com
wrote:

Wow how did that happen @jfrazelle https://github.com/jfrazelle


Reply to this email directly or view it on GitHub
#11278 (comment).

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

6 participants