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: fix bug and race in TestBuildSpaces #11543

Merged
merged 1 commit into from Mar 21, 2015

Conversation

Projects
None yet
4 participants
@ahmetb
Contributor

ahmetb commented Mar 21, 2015

TestBuildSpaces is used to do string manipulation to redact timestamps
from compared cmd output. However it was assuming there is going to be
only one time=".." in the output --not the case on windows. Therefore
I wrote a regexp to redact all log timestamps. This test is currently failing randomly
since test cannot replaces all timestamps correctly.

Also the test used to have a copy/paste bug (see err1/err2). This fixes
that, too.

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

integ-cli: fix bug and race in TestBuildSpaces
`TestBuildSpaces` is used to do string manipulation to redact timestamps
from compared cmd output. However it was assuming there is going to be
only one `time=".."` in the output --not the case on windows. Therefore
I wrote a regexp to redact all log timestamps.

Also the test used to have a copy/paste bug (see err1/err2). This fixes
that, too.

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

@jessfraz jessfraz added this to the 1.6.0 milestone Mar 21, 2015

@jessfraz

This comment has been minimized.

Contributor

jessfraz commented Mar 21, 2015

LGTM

@duglin

This comment has been minimized.

Contributor

duglin commented Mar 21, 2015

LGTM

duglin added a commit that referenced this pull request Mar 21, 2015

Merge pull request #11543 from ahmetalpbalkan/TestBuildSpaces
integ-cli: fix bug and race in TestBuildSpaces

@duglin duglin merged commit 4c443fa into moby:master Mar 21, 2015

0 of 2 checks passed

janky Jenkins build Docker-PRs 3826 has failed
Details
windows Jenkins build Windows-PRs 878 has failed
Details

@ahmetb ahmetb deleted the ahmetb:TestBuildSpaces branch Mar 23, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment