Skip to content

Commit 4e178fa

Browse files
committed
end-to-end test
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 3e71f23 commit 4e178fa

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

pkg/compose/convergence.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ func (c *convergence) ensureService(ctx context.Context, project *types.Project,
191191
case ContainerCreated:
192192
case ContainerRestarting:
193193
case ContainerExited:
194-
w.Event(progress.CreatedEvent(name))
195194
default:
196195
container := container
197196
eg.Go(tracing.EventWrapFuncForErrGroup(ctx, "service/start", tracing.ContainerOptions(container), func(ctx context.Context) error {
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
services:
2+
web:
3+
image: nginx
4+
networks:
5+
- test
6+
7+
networks:
8+
test:
9+
labels:
10+
- foo=${FOO:-foo}

pkg/e2e/networks_test.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,24 @@ func TestInterfaceName(t *testing.T) {
199199
})
200200
res.Assert(t, icmd.Expected{Out: "foobar@"})
201201
}
202+
203+
func TestNetworkRecreate(t *testing.T) {
204+
c := NewCLI(t)
205+
const projectName = "network_recreate"
206+
t.Cleanup(func() {
207+
c.cleanupWithDown(t, projectName)
208+
})
209+
c.RunDockerComposeCmd(t, "-f", "./fixtures/network-recreate/compose.yaml", "--project-name", projectName, "up", "-d")
210+
211+
c = NewCLI(t, WithEnv("FOO=bar"))
212+
res := c.RunDockerComposeCmd(t, "-f", "./fixtures/network-recreate/compose.yaml", "--project-name", projectName, "--progress=plain", "up", "-d")
213+
err := res.Stderr()
214+
fmt.Println(err)
215+
res.Assert(t, icmd.Expected{Err: `
216+
Container network_recreate-web-1 Stopped
217+
Network network_recreate_test Removed
218+
Network network_recreate_test Creating
219+
Network network_recreate_test Created
220+
Container network_recreate-web-1 Starting
221+
Container network_recreate-web-1 Started`})
222+
}

0 commit comments

Comments
 (0)