1
=== added file 'testing/cleanup.go'
2
--- testing/cleanup.go	1970-01-01 00:00:00 +0000
3
+++ testing/cleanup.go	2013-09-12 05:03:44 +0000
4
@@ -0,0 +1,46 @@
5
1
// Copyright 2013 Canonical Ltd.
6
2
// Licensed under the AGPLv3, see LICENCE file for details.
7
3
8
4
package testing
9
5
10
6
import (
11
7
	gc "launchpad.net/gocheck"
12
8
)
13
9
14
10
// CleanupSuite adds the ability to add cleanup functions that are called
15
11
// during either test tear down or suite tear down depending on the method
16
12
// called.
17
13
type CleanupSuite struct {
18
14
	testStack  []func()
19
15
	suiteStack []func()
20
16
}
21
17
22
18
func (s *CleanupSuite) SetUpSuite(c *gc.C) {
23
19
	s.suiteStack = nil
24
20
}
25
21
26
22
func (s *CleanupSuite) TearDownSuite(c *gc.C) {
27
23
	s.callStack(s.suiteStack)
28
24
}
29
25
30
26
func (s *CleanupSuite) SetUpTest(c *gc.C) {
31
27
	s.testStack = nil
32
28
}
33
29
34
30
func (s *CleanupSuite) TearDownTest(c *gc.C) {
35
31
	s.callStack(s.testStack)
36
32
}
37
33
38
34
func (s *CleanupSuite) callStack(stack []func()) {
39
35
	for i := len(stack) - 1; i >= 0; i-- {
40
36
		stack[i]()
41
37
	}
42
38
}
43
39
44
40
func (s *CleanupSuite) AddCleanup(cleanup func()) {
45
41
	s.testStack = append(s.testStack, cleanup)
46
42
}
47
43
48
44
func (s *CleanupSuite) AddSuiteCleanup(cleanup func()) {
49
45
	s.suiteStack = append(s.suiteStack, cleanup)
50
46
}
51
0
47
52
=== added file 'testing/cleanup_test.go'
53
--- testing/cleanup_test.go	1970-01-01 00:00:00 +0000
54
+++ testing/cleanup_test.go	2013-09-12 05:03:44 +0000
55
@@ -0,0 +1,57 @@
56
1
package testing_test
57
2
58
3
import (
59
4
	gc "launchpad.net/gocheck"
60
5
61
6
	"launchpad.net/juju-core/testing"
62
7
)
63
8
64
9
type cleanupSuite struct {
65
10
	testing.CleanupSuite
66
11
}
67
12
68
13
var _ = gc.Suite(&cleanupSuite{})
69
14
70
15
func (s *cleanupSuite) TestTearDownSuiteEmpty(c *gc.C) {
71
16
	// The suite stack is empty initially, check we can tear that down.
72
17
	s.TearDownSuite(c)
73
18
	s.SetUpSuite(c)
74
19
}
75
20
76
21
func (s *cleanupSuite) TestTearDownTestEmpty(c *gc.C) {
77
22
	// The test stack is empty initially, check we can tear that down.
78
23
	s.TearDownTest(c)
79
24
	s.SetUpTest(c)
80
25
}
81
26
82
27
func (s *cleanupSuite) TestAddSuiteCleanup(c *gc.C) {
83
28
	order := []string{}
84
29
	s.AddSuiteCleanup(func() {
85
30
		order = append(order, "first")
86
31
	})
87
32
	s.AddSuiteCleanup(func() {
88
33
		order = append(order, "second")
89
34
	})
90
35
91
36
	s.TearDownSuite(c)
92
37
	c.Assert(order, gc.DeepEquals, []string{"second", "first"})
93
38
94
39
	// and to avoid calling them twice, clear out the stack.
95
40
	s.SetUpSuite(c)
96
41
}
97
42
98
43
func (s *cleanupSuite) TestAddCleanup(c *gc.C) {
99
44
	order := []string{}
100
45
	s.AddCleanup(func() {
101
46
		order = append(order, "first")
102
47
	})
103
48
	s.AddCleanup(func() {
104
49
		order = append(order, "second")
105
50
	})
106
51
107
52
	s.TearDownTest(c)
108
53
	c.Assert(order, gc.DeepEquals, []string{"second", "first"})
109
54
110
55
	// and to avoid calling them twice, clear out the stack.
111
56
	s.SetUpTest(c)
112
57
}
113
0
58
114
=== modified file 'testing/log.go'
115
--- testing/log.go	2013-08-28 17:20:01 +0000
116
+++ testing/log.go	2013-09-12 05:03:44 +0000
117
@@ -14,7 +14,7 @@
118
14
// LoggingSuite redirects the juju logger to the test logger
14
// LoggingSuite redirects the juju logger to the test logger
119
15
// when embedded in a gocheck suite type.
15
// when embedded in a gocheck suite type.
120
16
type LoggingSuite struct {
16
type LoggingSuite struct {
122
17
	restoreLog func()
17
	CleanupSuite
123
18
}
18
}
124
19
19
125
20
type gocheckWriter struct {
20
type gocheckWriter struct {
126
@@ -27,21 +27,19 @@
127
27
}
27
}
128
28
28
129
29
func (t *LoggingSuite) SetUpSuite(c *gc.C) {
29
func (t *LoggingSuite) SetUpSuite(c *gc.C) {
130
30
	t.CleanupSuite.SetUpSuite(c)
131
30
	t.setUp(c)
31
	t.setUp(c)
137
31
}
32
	t.AddSuiteCleanup(func() {
138
32
33
		loggo.ResetLoggers()
139
33
func (t *LoggingSuite) TearDownSuite(c *gc.C) {
34
		loggo.ResetWriters()
140
34
	loggo.ResetLoggers()
35
	})
136
35
	loggo.ResetWriters()
141
36
}
36
}
142
37
37
143
38
func (t *LoggingSuite) SetUpTest(c *gc.C) {
38
func (t *LoggingSuite) SetUpTest(c *gc.C) {
144
39
	t.CleanupSuite.SetUpTest(c)
145
39
	t.setUp(c)
40
	t.setUp(c)
146
40
}
41
}
147
41
42
148
42
func (t *LoggingSuite) TearDownTest(c *gc.C) {
149
43
}
150
44
151
45
func (t *LoggingSuite) setUp(c *gc.C) {
43
func (t *LoggingSuite) setUp(c *gc.C) {
152
46
	loggo.ResetWriters()
44
	loggo.ResetWriters()
153
47
	loggo.ReplaceDefaultWriter(&gocheckWriter{c})
45
	loggo.ReplaceDefaultWriter(&gocheckWriter{c})
Status:	Merged
Approved by:	John A Meinel on 2013-09-12
Approved revision:	no longer in the source branch.
Merged at revision:	1791
Proposed branch:	lp:~thumper/juju-core/cleanup-suite
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	153 lines (+110/-9) 3 files modified testing/cleanup.go (+46/-0) testing/cleanup_test.go (+57/-0) testing/log.go (+7/-9)
To merge this branch:	bzr merge lp:~thumper/juju-core/cleanup-suite
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-09-12	Pending
Review via email: mp+185199@code.launchpad.net