Skip to content

Commit 38856a9

Browse files
flotterflotter
committed
simplify test code
1 parent d85f57a commit 38856a9

File tree

1 file changed

+2
-253
lines changed

1 file changed

+2
-253
lines changed

‎internals/overlord/planstate/manager_test.go‎

Lines changed: 2 additions & 253 deletions
Original file line numberDiff line numberDiff line change
@@ -45,52 +45,6 @@ var loadLayers = []string{`
4545
summary: Svc1
4646
override: replace
4747
command: echo svc1
48-
`, `
49-
summary: Layer 2
50-
description: Layer 2 desc.
51-
services:
52-
svc2:
53-
summary: Svc2
54-
override: replace
55-
command: echo svc2
56-
`}
57-
58-
func (ps *planSuite) TestLoadLayers(c *C) {
59-
var err error
60-
ps.planMgr, err = planstate.NewManager(ps.layersDir)
61-
c.Assert(err, IsNil)
62-
// Write layers
63-
for _, l := range loadLayers {
64-
ps.writeLayer(c, string(reindent(l)))
65-
}
66-
// Load the plan from the <pebble-dir>/layers directory
67-
err = ps.planMgr.Load()
68-
c.Assert(err, IsNil)
69-
plan := ps.planMgr.Plan()
70-
out, err := yaml.Marshal(plan)
71-
c.Assert(err, IsNil)
72-
c.Assert(len(plan.Layers), Equals, 2)
73-
c.Assert(string(out), Equals, `
74-
services:
75-
svc1:
76-
summary: Svc1
77-
override: replace
78-
command: echo svc1
79-
svc2:
80-
summary: Svc2
81-
override: replace
82-
command: echo svc2
83-
`[1:])
84-
}
85-
86-
var extLoadLayers = []string{`
87-
summary: Layer 1
88-
description: Layer 1 desc.
89-
services:
90-
svc1:
91-
summary: Svc1
92-
override: replace
93-
command: echo svc1
9448
test-field:
9549
test1:
9650
override: merge
@@ -109,15 +63,14 @@ var extLoadLayers = []string{`
10963
b: something else
11064
`}
11165

112-
func (ps *planSuite) TestExtLoadLayers(c *C) {
66+
func (ps *planSuite) TestLoadLayers(c *C) {
11367
plan.RegisterExtension(testField, testExtension{})
11468
defer plan.UnregisterExtension(testField)
115-
11669
var err error
11770
ps.planMgr, err = planstate.NewManager(ps.layersDir)
11871
c.Assert(err, IsNil)
11972
// Write layers
120-
for _, l := range extLoadLayers {
73+
for _, l := range loadLayers {
12174
ps.writeLayer(c, string(reindent(l)))
12275
}
12376
// Load the plan from the <pebble-dir>/layers directory
@@ -146,89 +99,8 @@ test-field:
14699
}
147100

148101
func (ps *planSuite) TestAppendLayers(c *C) {
149-
var err error
150-
ps.planMgr, err = planstate.NewManager(ps.layersDir)
151-
c.Assert(err, IsNil)
152-
153-
// Append a layer when there are no layers.
154-
layer := ps.parseLayer(c, 0, "label1", `
155-
services:
156-
svc1:
157-
override: replace
158-
command: /bin/sh
159-
`)
160-
err = ps.planMgr.AppendLayer(layer)
161-
c.Assert(err, IsNil)
162-
c.Assert(layer.Order, Equals, 1)
163-
c.Assert(ps.planYAML(c), Equals, `
164-
services:
165-
svc1:
166-
override: replace
167-
command: /bin/sh
168-
`[1:])
169-
ps.planLayersHasLen(c, 1)
170-
171-
// Try to append a layer when that label already exists.
172-
layer = ps.parseLayer(c, 0, "label1", `
173-
services:
174-
svc1:
175-
override: foobar
176-
command: /bin/bar
177-
`)
178-
err = ps.planMgr.AppendLayer(layer)
179-
c.Assert(err.(*planstate.LabelExists).Label, Equals, "label1")
180-
c.Assert(ps.planYAML(c), Equals, `
181-
services:
182-
svc1:
183-
override: replace
184-
command: /bin/sh
185-
`[1:])
186-
ps.planLayersHasLen(c, 1)
187-
188-
// Append another layer on top.
189-
layer = ps.parseLayer(c, 0, "label2", `
190-
services:
191-
svc1:
192-
override: replace
193-
command: /bin/bash
194-
`)
195-
err = ps.planMgr.AppendLayer(layer)
196-
c.Assert(err, IsNil)
197-
c.Assert(layer.Order, Equals, 2)
198-
c.Assert(ps.planYAML(c), Equals, `
199-
services:
200-
svc1:
201-
override: replace
202-
command: /bin/bash
203-
`[1:])
204-
ps.planLayersHasLen(c, 2)
205-
206-
// Append a layer with a different service.
207-
layer = ps.parseLayer(c, 0, "label3", `
208-
services:
209-
svc2:
210-
override: replace
211-
command: /bin/foo
212-
`)
213-
err = ps.planMgr.AppendLayer(layer)
214-
c.Assert(err, IsNil)
215-
c.Assert(layer.Order, Equals, 3)
216-
c.Assert(ps.planYAML(c), Equals, `
217-
services:
218-
svc1:
219-
override: replace
220-
command: /bin/bash
221-
svc2:
222-
override: replace
223-
command: /bin/foo
224-
`[1:])
225-
ps.planLayersHasLen(c, 3)
226-
}
227-
228-
func (ps *planSuite) TestExtAppendLayers(c *C) {
229102
plan.RegisterExtension(testField, testExtension{})
230103
defer plan.UnregisterExtension(testField)
231-
232104
var err error
233105
ps.planMgr, err = planstate.NewManager(ps.layersDir)
234106
c.Assert(err, IsNil)
@@ -344,131 +216,8 @@ test-field:
344216
}
345217

346218
func (ps *planSuite) TestCombineLayers(c *C) {
347-
var err error
348-
ps.planMgr, err = planstate.NewManager(ps.layersDir)
349-
c.Assert(err, IsNil)
350-
351-
// "Combine" layer with no layers should just append.
352-
layer := ps.parseLayer(c, 0, "label1", `
353-
services:
354-
svc1:
355-
override: replace
356-
command: /bin/sh
357-
`)
358-
err = ps.planMgr.CombineLayer(layer)
359-
c.Assert(err, IsNil)
360-
c.Assert(layer.Order, Equals, 1)
361-
c.Assert(ps.planYAML(c), Equals, `
362-
services:
363-
svc1:
364-
override: replace
365-
command: /bin/sh
366-
`[1:])
367-
ps.planLayersHasLen(c, 1)
368-
369-
// Combine layer with different label should just append.
370-
layer = ps.parseLayer(c, 0, "label2", `
371-
services:
372-
svc2:
373-
override: replace
374-
command: /bin/foo
375-
`)
376-
err = ps.planMgr.CombineLayer(layer)
377-
c.Assert(err, IsNil)
378-
c.Assert(layer.Order, Equals, 2)
379-
c.Assert(ps.planYAML(c), Equals, `
380-
services:
381-
svc1:
382-
override: replace
383-
command: /bin/sh
384-
svc2:
385-
override: replace
386-
command: /bin/foo
387-
`[1:])
388-
ps.planLayersHasLen(c, 2)
389-
390-
// Combine layer with first layer.
391-
layer = ps.parseLayer(c, 0, "label1", `
392-
services:
393-
svc1:
394-
override: replace
395-
command: /bin/bash
396-
`)
397-
err = ps.planMgr.CombineLayer(layer)
398-
c.Assert(err, IsNil)
399-
c.Assert(layer.Order, Equals, 1)
400-
c.Assert(ps.planYAML(c), Equals, `
401-
services:
402-
svc1:
403-
override: replace
404-
command: /bin/bash
405-
svc2:
406-
override: replace
407-
command: /bin/foo
408-
`[1:])
409-
ps.planLayersHasLen(c, 2)
410-
411-
// Combine layer with second layer.
412-
layer = ps.parseLayer(c, 0, "label2", `
413-
services:
414-
svc2:
415-
override: replace
416-
command: /bin/bar
417-
`)
418-
err = ps.planMgr.CombineLayer(layer)
419-
c.Assert(err, IsNil)
420-
c.Assert(layer.Order, Equals, 2)
421-
c.Assert(ps.planYAML(c), Equals, `
422-
services:
423-
svc1:
424-
override: replace
425-
command: /bin/bash
426-
svc2:
427-
override: replace
428-
command: /bin/bar
429-
`[1:])
430-
ps.planLayersHasLen(c, 2)
431-
432-
// One last append for good measure.
433-
layer = ps.parseLayer(c, 0, "label3", `
434-
services:
435-
svc1:
436-
override: replace
437-
command: /bin/a
438-
svc2:
439-
override: replace
440-
command: /bin/b
441-
`)
442-
err = ps.planMgr.CombineLayer(layer)
443-
c.Assert(err, IsNil)
444-
c.Assert(layer.Order, Equals, 3)
445-
c.Assert(ps.planYAML(c), Equals, `
446-
services:
447-
svc1:
448-
override: replace
449-
command: /bin/a
450-
svc2:
451-
override: replace
452-
command: /bin/b
453-
`[1:])
454-
ps.planLayersHasLen(c, 3)
455-
456-
// Make sure that layer validation is happening.
457-
layer, err = plan.ParseLayer(0, "label4", []byte(`
458-
checks:
459-
bad-check:
460-
override: replace
461-
level: invalid
462-
tcp:
463-
port: 8080
464-
`))
465-
c.Check(err, ErrorMatches, `(?s).*plan check.*must be "alive" or "ready".*`)
466-
}
467-
468-
func (ps *planSuite) TestExtCombineLayers(c *C) {
469219
plan.RegisterExtension(testField, testExtension{})
470220
defer plan.UnregisterExtension(testField)
471-
472221
var err error
473222
ps.planMgr, err = planstate.NewManager(ps.layersDir)
474223
c.Assert(err, IsNil)

0 commit comments

Comments
 (0)