X Tutup
Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] Return error if basename is expanded to blank#25

Merged
andrewhsu merged 1 commit intodocker-archive:18.06from
thaJeztah:18.06-backport-error_when_base_name_resolved_to_blank
Aug 7, 2018
Merged

[18.06] Return error if basename is expanded to blank#25
andrewhsu merged 1 commit intodocker-archive:18.06from
thaJeztah:18.06-backport-error_when_base_name_resolved_to_blank

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 16, 2018

cherry-pick of moby#37396 for 18.06

git checkout -b 18.06-backport-error_when_base_name_resolved_to_blank ce-engine/18.06
git cherry-pick -s -S -x c9542d313e2a52807644742e5fd684bc2de9f507

cherry-pick was clean; no conflicts

Fix: moby#37325

@thaJeztah thaJeztah added this to the 18.06.0 milestone Jul 16, 2018
@andrewhsu
Copy link

andrewhsu commented Jul 18, 2018

I see green tests, but not sure if I'm looking in the wrong place I can't seem to find TestFromWithArgButBuildArgsNotGiven.

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 18, 2018

Ah powerpc terminated before that test;

  --- FAIL: TestExternalGraphDriver/pull (0.93s)
23:01:57     	external_test.go:402: assertion failed: error is not nil: Error: No such image: busybox:latest

@thaJeztah thaJeztah modified the milestones: 18.06.0, 18.06.1 Jul 20, 2018
@yui-knk @thaJeztah
Return error if basename is expanded to blank
226fadc 
Fix: moby#37325

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
(cherry picked from commit c9542d3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.06-backport-error_when_base_name_resolved_to_blank branch from c14bad0 to 226fadc Compare August 6, 2018 13:50
@thaJeztah
Copy link
Member Author

thaJeztah commented Aug 7, 2018

PowerPC https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/10732/console failing on a flaky test
moby#34988

15:21:58 FAIL: docker_api_swarm_test.go:359: DockerSwarmSuite.TestAPISwarmRaftQuorum
15:21:58 
15:21:58 [de026b00cea4f] waiting for daemon to start
15:21:58 [de026b00cea4f] daemon started
15:21:58 
15:21:58 [db40b84748f09] waiting for daemon to start
15:21:58 [db40b84748f09] daemon started
15:21:58 
15:21:58 [da6f923c3d37d] waiting for daemon to start
15:21:58 [da6f923c3d37d] daemon started
15:21:58 
15:21:58 [db40b84748f09] exiting daemon
15:21:58 [da6f923c3d37d] exiting daemon
15:21:58 docker_api_swarm_test.go:385:
15:21:58     // d1 will eventually step down from leader because there is no longer an active quorum, wait for that to happen
15:21:58     waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
15:21:58         _, err = cli.ServiceCreate(context.Background(), service.Spec, types.ServiceCreateOptions{})
15:21:58         return err.Error(), nil
15:21:58     }, checker.Contains, "Make sure more than half of the managers are online.")
15:21:58 docker_utils_test.go:435:
15:21:58     c.Assert(v, checker, args...)
15:21:58 ... obtained string = "Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded"
15:21:58 ... substring string = "Make sure more than half of the managers are online."
15:21:58 
15:21:58 [de026b00cea4f] exiting daemon

andrewhsu
andrewhsu approved these changes Aug 7, 2018
View reviewed changes
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit c4a6ecf into docker-archive:18.06 Aug 7, 2018
@thaJeztah thaJeztah deleted the 18.06-backport-error_when_base_name_resolved_to_blank branch August 7, 2018 23:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@andrewhsu andrewhsu andrewhsu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.06.1

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @andrewhsu @yui-knk
X Tutup