1
=== modified file 'container/lxc/export_test.go'
2
--- container/lxc/export_test.go	2013-10-01 02:21:52 +0000
3
+++ container/lxc/export_test.go	2014-03-11 03:19:30 +0000
4
@@ -4,7 +4,8 @@
5
4
package lxc
4
package lxc
6
5
5
7
6
var (
6
var (
11
7
	NetworkConfigTemplate = networkConfigTemplate
7
	NetworkConfigTemplate   = networkConfigTemplate
12
8
	GenerateNetworkConfig = generateNetworkConfig
8
	GenerateNetworkConfig   = generateNetworkConfig
13
9
	RestartSymlink        = restartSymlink
9
	RestartSymlink          = restartSymlink
14
10
	ContainerConfigFilename = containerConfigFilename
15
10
)
11
)
16
11
12
17
=== modified file 'container/lxc/lxc.go'
18
--- container/lxc/lxc.go	2014-03-10 02:51:31 +0000
19
+++ container/lxc/lxc.go	2014-03-11 03:19:30 +0000
20
@@ -96,7 +96,7 @@
21
96
		return nil, nil, err
96
		return nil, nil, err
22
97
	}
97
	}
23
98
	logger.Tracef("write the lxc.conf file")
98
	logger.Tracef("write the lxc.conf file")
25
99
	configFile, err := writeLxcConfig(network, directory, manager.logdir)
99
	configFile, err := writeLxcConfig(network, directory)
26
100
	if err != nil {
100
	if err != nil {
27
101
		logger.Errorf("failed to write config file: %v", err)
101
		logger.Errorf("failed to write config file: %v", err)
28
102
		return nil, nil, err
102
		return nil, nil, err
29
@@ -113,25 +113,14 @@
30
113
		logger.Errorf("lxc container creation failed: %v", err)
113
		logger.Errorf("lxc container creation failed: %v", err)
31
114
		return nil, nil, err
114
		return nil, nil, err
32
115
	}
115
	}
33
116
	// Make sure that the mount dir has been created.
34
117
	logger.Tracef("make the mount dir for the shard logs")
35
118
	if err := os.MkdirAll(internalLogDir(name), 0755); err != nil {
36
119
		logger.Errorf("failed to create internal /var/log/juju mount dir: %v", err)
37
120
		return nil, nil, err
38
121
	}
39
122
	logger.Tracef("lxc container created")
116
	logger.Tracef("lxc container created")
40
123
	// Now symlink the config file into the restart directory, if it exists.
41
124
	// This is for backwards compatiblity. From Trusty onwards, the auto start
42
125
	// option should be set in the LXC config file, this is done in the networkConfigTemplate
43
126
	// function below.
44
127
	if useRestartDir() {
45
128
		containerConfigFile := filepath.Join(LxcContainerDir, name, "config")
46
129
		if err := os.Symlink(containerConfigFile, restartSymlink(name)); err != nil {
47
130
			return nil, nil, err
48
131
		}
49
132
		logger.Tracef("auto-restart link created")
50
133
	}
51
134
117
52
118
	if err := autostartContainer(name); err != nil {
53
119
		return nil, nil, err
54
120
	}
55
121
	if err := mountHostLogDir(name, manager.logdir); err != nil {
56
122
		return nil, nil, err
57
123
	}
58
135
	// Start the lxc container with the appropriate settings for grabbing the
124
	// Start the lxc container with the appropriate settings for grabbing the
59
136
	// console output and a log file.
125
	// console output and a log file.
60
137
	consoleFile := filepath.Join(directory, "console.log")
126
	consoleFile := filepath.Join(directory, "console.log")
61
@@ -153,6 +142,50 @@
62
153
	return &lxcInstance{lxcContainer, name}, hardware, nil
142
	return &lxcInstance{lxcContainer, name}, hardware, nil
63
154
}
143
}
64
155
144
65
145
func appendToContainerConfig(name, line string) error {
66
146
	file, err := os.OpenFile(
67
147
		containerConfigFilename(name), os.O_RDWR|os.O_APPEND, 0644)
68
148
	if err != nil {
69
149
		return err
70
150
	}
71
151
	defer file.Close()
72
152
	_, err = file.WriteString(line)
73
153
	return err
74
154
}
75
155
76
156
func autostartContainer(name string) error {
77
157
	// Now symlink the config file into the restart directory, if it exists.
78
158
	// This is for backwards compatiblity. From Trusty onwards, the auto start
79
159
	// option should be set in the LXC config file, this is done in the networkConfigTemplate
80
160
	// function below.
81
161
	if useRestartDir() {
82
162
		if err := os.Symlink(
83
163
			containerConfigFilename(name),
84
164
			restartSymlink(name),
85
165
		); err != nil {
86
166
			return err
87
167
		}
88
168
		logger.Tracef("auto-restart link created")
89
169
	} else {
90
170
		logger.Tracef("Setting auto start to true in lxc config.")
91
171
		return appendToContainerConfig(name, "lxc.start.auto = 1\n")
92
172
	}
93
173
	return nil
94
174
}
95
175
96
176
func mountHostLogDir(name, logDir string) error {
97
177
	// Make sure that the mount dir has been created.
98
178
	logger.Tracef("make the mount dir for the shared logs")
99
179
	if err := os.MkdirAll(internalLogDir(name), 0755); err != nil {
100
180
		logger.Errorf("failed to create internal /var/log/juju mount dir: %v", err)
101
181
		return err
102
182
	}
103
183
	line := fmt.Sprintf(
104
184
		"lxc.mount.entry=%s var/log/juju none defaults,bind 0 0\n",
105
185
		logDir)
106
186
	return appendToContainerConfig(name, line)
107
187
}
108
188
109
156
func (manager *containerManager) StopContainer(instance instance.Instance) error {
189
func (manager *containerManager) StopContainer(instance instance.Instance) error {
110
157
	name := string(instance.Id())
190
	name := string(instance.Id())
111
158
	lxcContainer := LxcObjectFactory.New(name)
191
	lxcContainer := LxcObjectFactory.New(name)
112
@@ -205,9 +238,9 @@
113
205
	return filepath.Join(LxcRestartDir, name+".conf")
238
	return filepath.Join(LxcRestartDir, name+".conf")
114
206
}
239
}
115
207
240
119
208
const localConfig = `%s
241
func containerConfigFilename(name string) string {
120
209
lxc.mount.entry=%s var/log/juju none defaults,bind 0 0
242
	return filepath.Join(LxcContainerDir, name, "config")
121
210
`
243
}
122
211
244
123
212
const networkTemplate = `
245
const networkTemplate = `
124
213
lxc.network.type = %s
246
lxc.network.type = %s
125
@@ -216,12 +249,7 @@
126
216
`
249
`
127
217
250
128
218
func networkConfigTemplate(networkType, networkLink string) string {
251
func networkConfigTemplate(networkType, networkLink string) string {
135
219
	networkConfig := fmt.Sprintf(networkTemplate, networkType, networkLink)
252
	return fmt.Sprintf(networkTemplate, networkType, networkLink)
130
220
	if !useRestartDir() {
131
221
		networkConfig += "lxc.start.auto = 1\n"
132
222
		logger.Tracef("Setting auto start to true in lxc config.")
133
223
	}
134
224
	return networkConfig
136
225
}
253
}
137
226
254
138
227
func generateNetworkConfig(network *container.NetworkConfig) string {
255
func generateNetworkConfig(network *container.NetworkConfig) string {
139
@@ -240,11 +268,10 @@
140
240
	}
268
	}
141
241
}
269
}
142
242
270
144
243
func writeLxcConfig(network *container.NetworkConfig, directory, logdir string) (string, error) {
271
func writeLxcConfig(network *container.NetworkConfig, directory string) (string, error) {
145
244
	networkConfig := generateNetworkConfig(network)
272
	networkConfig := generateNetworkConfig(network)
146
245
	configFilename := filepath.Join(directory, "lxc.conf")
273
	configFilename := filepath.Join(directory, "lxc.conf")
149
246
	configContent := fmt.Sprintf(localConfig, networkConfig, logdir)
274
	if err := ioutil.WriteFile(configFilename, []byte(networkConfig), 0644); err != nil {
148
247
	if err := ioutil.WriteFile(configFilename, []byte(configContent), 0644); err != nil {
150
248
		return "", err
275
		return "", err
151
249
	}
276
	}
152
250
	return configFilename, nil
277
	return configFilename, nil
153
251
278
154
=== modified file 'container/lxc/lxc_test.go'
155
--- container/lxc/lxc_test.go	2014-03-10 02:51:31 +0000
156
+++ container/lxc/lxc_test.go	2014-03-11 03:19:30 +0000
157
@@ -185,16 +185,18 @@
158
185
185
159
186
	manager := s.makeManager(c, "test")
186
	manager := s.makeManager(c, "test")
160
187
	instance := containertesting.StartContainer(c, manager, "1/lxc/0")
187
	instance := containertesting.StartContainer(c, manager, "1/lxc/0")
164
188
	autostartLink := lxc.RestartSymlink(string(instance.Id()))
188
	name := string(instance.Id())
165
189
189
	autostartLink := lxc.RestartSymlink(name)
166
190
	config := lxc.NetworkConfigTemplate("foo", "bar")
190
	config, err := ioutil.ReadFile(lxc.ContainerConfigFilename(name))
167
191
	c.Assert(err, gc.IsNil)
168
191
	expected := `
192
	expected := `
171
192
lxc.network.type = foo
193
lxc.network.type = veth
172
193
lxc.network.link = bar
194
lxc.network.link = nic42
173
194
lxc.network.flags = up
195
lxc.network.flags = up
174
195
lxc.start.auto = 1
196
lxc.start.auto = 1
175
197
lxc.mount.entry=/var/log/juju var/log/juju none defaults,bind 0 0
176
196
`
198
`
178
197
	c.Assert(config, gc.Equals, expected)
199
	c.Assert(string(config), gc.Equals, expected)
179
198
	c.Assert(autostartLink, jc.DoesNotExist)
200
	c.Assert(autostartLink, jc.DoesNotExist)
180
199
}
201
}
181
200
202
182
201
203
183
=== modified file 'container/lxc/mock/mock-lxc.go'
184
--- container/lxc/mock/mock-lxc.go	2013-09-30 01:50:43 +0000
185
+++ container/lxc/mock/mock-lxc.go	2014-03-11 03:19:30 +0000
186
@@ -5,8 +5,12 @@
187
5
5
188
6
import (
6
import (
189
7
	"fmt"
7
	"fmt"
190
8
	"os"
191
9
	"path/filepath"
192
8
10
193
9
	"launchpad.net/golxc"
11
	"launchpad.net/golxc"
194
12
195
13
	"launchpad.net/juju-core/utils"
196
10
)
14
)
197
11
15
198
12
// This file provides a mock implementation of the golxc interfaces
16
// This file provides a mock implementation of the golxc interfaces
199
@@ -44,13 +48,15 @@
200
44
}
48
}
201
45
49
202
46
type mockFactory struct {
50
type mockFactory struct {
205
47
	instances map[string]golxc.Container
51
	containerDir string
206
48
	listeners []chan<- Event
52
	instances    map[string]golxc.Container
207
53
	listeners    []chan<- Event
208
49
}
54
}
209
50
55
211
51
func MockFactory() ContainerFactory {
56
func MockFactory(containerDir string) ContainerFactory {
212
52
	return &mockFactory{
57
	return &mockFactory{
214
53
		instances: make(map[string]golxc.Container),
58
		containerDir: containerDir,
215
59
		instances:    make(map[string]golxc.Container),
216
54
	}
60
	}
217
55
}
61
}
218
56
62
219
@@ -74,7 +80,13 @@
220
74
	}
80
	}
221
75
	mock.state = golxc.StateStopped
81
	mock.state = golxc.StateStopped
222
76
	mock.factory.instances[mock.name] = mock
82
	mock.factory.instances[mock.name] = mock
224
77
	return nil
83
	// Create the container directory.
225
84
	containerDir := filepath.Join(mock.factory.containerDir, mock.name)
226
85
	if err := os.MkdirAll(containerDir, 0755); err != nil {
227
86
		return err
228
87
	}
229
88
	containerConfig := filepath.Join(containerDir, "config")
230
89
	return utils.CopyFile(containerConfig, configFile)
231
78
}
90
}
232
79
91
233
80
// Start runs the container as a daemon.
92
// Start runs the container as a daemon.
234
81
93
235
=== modified file 'container/lxc/testing/test.go'
236
--- container/lxc/testing/test.go	2013-11-11 22:45:29 +0000
237
+++ container/lxc/testing/test.go	2014-03-11 03:19:30 +0000
238
@@ -33,6 +33,6 @@
239
33
	s.PatchValue(&lxc.LxcContainerDir, s.LxcDir)
33
	s.PatchValue(&lxc.LxcContainerDir, s.LxcDir)
240
34
	s.RestartDir = c.MkDir()
34
	s.RestartDir = c.MkDir()
241
35
	s.PatchValue(&lxc.LxcRestartDir, s.RestartDir)
35
	s.PatchValue(&lxc.LxcRestartDir, s.RestartDir)
243
36
	s.Factory = mock.MockFactory()
36
	s.Factory = mock.MockFactory(s.LxcDir)
244
37
	s.PatchValue(&lxc.LxcObjectFactory, s.Factory)
37
	s.PatchValue(&lxc.LxcObjectFactory, s.Factory)
245
38
}
38
}
Status:	Merged
Approved by:	Tim Penhey on 2014-03-11
Approved revision:	no longer in the source branch.
Merged at revision:	2405
Proposed branch:	lp:~thumper/juju-core/autostart-containers-after-creation
Merge into:	lp:~go-bot/juju-core/trunk
Prerequisite:	lp:~thumper/juju-core/fast-lxc
Diff against target:	245 lines (+87/-45) 5 files modified container/lxc/export_test.go (+4/-3) container/lxc/lxc.go (+57/-30) container/lxc/lxc_test.go (+8/-6) container/lxc/mock/mock-lxc.go (+17/-5) container/lxc/testing/test.go (+1/-1)
To merge this branch:	bzr merge lp:~thumper/juju-core/autostart-containers-after-creation
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-03-09	Pending
Review via email: mp+210099@code.launchpad.net
1	=== modified file 'container/lxc/export_test.go'
2	--- container/lxc/export_test.go 2013-10-01 02:21:52 +0000
3	+++ container/lxc/export_test.go 2014-03-11 03:19:30 +0000
4	@@ -4,7 +4,8 @@
5	4	package lxc	4	package lxc
6	5		5
7	6	var (	6	var (
11	7	NetworkConfigTemplate = networkConfigTemplate	7	NetworkConfigTemplate = networkConfigTemplate
12	8	GenerateNetworkConfig = generateNetworkConfig	8	GenerateNetworkConfig = generateNetworkConfig
13	9	RestartSymlink = restartSymlink	9	RestartSymlink = restartSymlink
14			10	ContainerConfigFilename = containerConfigFilename
15	10	)	11	)
16	11		12
17	=== modified file 'container/lxc/lxc.go'
18	--- container/lxc/lxc.go 2014-03-10 02:51:31 +0000
19	+++ container/lxc/lxc.go 2014-03-11 03:19:30 +0000
20	@@ -96,7 +96,7 @@
21	96	return nil, nil, err	96	return nil, nil, err
22	97	}	97	}
23	98	logger.Tracef("write the lxc.conf file")	98	logger.Tracef("write the lxc.conf file")
25	99	configFile, err := writeLxcConfig(network, directory, manager.logdir)	99	configFile, err := writeLxcConfig(network, directory)
26	100	if err != nil {	100	if err != nil {
27	101	logger.Errorf("failed to write config file: %v", err)	101	logger.Errorf("failed to write config file: %v", err)
28	102	return nil, nil, err	102	return nil, nil, err
29	@@ -113,25 +113,14 @@
30	113	logger.Errorf("lxc container creation failed: %v", err)	113	logger.Errorf("lxc container creation failed: %v", err)
31	114	return nil, nil, err	114	return nil, nil, err
32	115	}	115	}
33	116	// Make sure that the mount dir has been created.
34	117	logger.Tracef("make the mount dir for the shard logs")
35	118	if err := os.MkdirAll(internalLogDir(name), 0755); err != nil {
36	119	logger.Errorf("failed to create internal /var/log/juju mount dir: %v", err)
37	120	return nil, nil, err
38	121	}
39	122	logger.Tracef("lxc container created")	116	logger.Tracef("lxc container created")
40	123	// Now symlink the config file into the restart directory, if it exists.
41	124	// This is for backwards compatiblity. From Trusty onwards, the auto start
42	125	// option should be set in the LXC config file, this is done in the networkConfigTemplate
43	126	// function below.
44	127	if useRestartDir() {
45	128	containerConfigFile := filepath.Join(LxcContainerDir, name, "config")
46	129	if err := os.Symlink(containerConfigFile, restartSymlink(name)); err != nil {
47	130	return nil, nil, err
48	131	}
49	132	logger.Tracef("auto-restart link created")
50	133	}
51	134		117
52			118	if err := autostartContainer(name); err != nil {
53			119	return nil, nil, err
54			120	}
55			121	if err := mountHostLogDir(name, manager.logdir); err != nil {
56			122	return nil, nil, err
57			123	}
58	135	// Start the lxc container with the appropriate settings for grabbing the	124	// Start the lxc container with the appropriate settings for grabbing the
59	136	// console output and a log file.	125	// console output and a log file.
60	137	consoleFile := filepath.Join(directory, "console.log")	126	consoleFile := filepath.Join(directory, "console.log")
61	@@ -153,6 +142,50 @@
62	153	return &lxcInstance{lxcContainer, name}, hardware, nil	142	return &lxcInstance{lxcContainer, name}, hardware, nil
63	154	}	143	}
64	155		144
65			145	func appendToContainerConfig(name, line string) error {
66			146	file, err := os.OpenFile(
67			147	containerConfigFilename(name), os.O_RDWR\|os.O_APPEND, 0644)
68			148	if err != nil {
69			149	return err
70			150	}
71			151	defer file.Close()
72			152	_, err = file.WriteString(line)
73			153	return err
74			154	}
75			155
76			156	func autostartContainer(name string) error {
77			157	// Now symlink the config file into the restart directory, if it exists.
78			158	// This is for backwards compatiblity. From Trusty onwards, the auto start
79			159	// option should be set in the LXC config file, this is done in the networkConfigTemplate
80			160	// function below.
81			161	if useRestartDir() {
82			162	if err := os.Symlink(
83			163	containerConfigFilename(name),
84			164	restartSymlink(name),
85			165	); err != nil {
86			166	return err
87			167	}
88			168	logger.Tracef("auto-restart link created")
89			169	} else {
90			170	logger.Tracef("Setting auto start to true in lxc config.")
91			171	return appendToContainerConfig(name, "lxc.start.auto = 1\n")
92			172	}
93			173	return nil
94			174	}
95			175
96			176	func mountHostLogDir(name, logDir string) error {
97			177	// Make sure that the mount dir has been created.
98			178	logger.Tracef("make the mount dir for the shared logs")
99			179	if err := os.MkdirAll(internalLogDir(name), 0755); err != nil {
100			180	logger.Errorf("failed to create internal /var/log/juju mount dir: %v", err)
101			181	return err
102			182	}
103			183	line := fmt.Sprintf(
104			184	"lxc.mount.entry=%s var/log/juju none defaults,bind 0 0\n",
105			185	logDir)
106			186	return appendToContainerConfig(name, line)
107			187	}
108			188
109	156	func (manager *containerManager) StopContainer(instance instance.Instance) error {	189	func (manager *containerManager) StopContainer(instance instance.Instance) error {
110	157	name := string(instance.Id())	190	name := string(instance.Id())
111	158	lxcContainer := LxcObjectFactory.New(name)	191	lxcContainer := LxcObjectFactory.New(name)
112	@@ -205,9 +238,9 @@
113	205	return filepath.Join(LxcRestartDir, name+".conf")	238	return filepath.Join(LxcRestartDir, name+".conf")
114	206	}	239	}
115	207		240
119	208	const localConfig = `%s	241	func containerConfigFilename(name string) string {
120	209	lxc.mount.entry=%s var/log/juju none defaults,bind 0 0	242	return filepath.Join(LxcContainerDir, name, "config")
121	210	`	243	}
122	211		244
123	212	const networkTemplate = `	245	const networkTemplate = `
124	213	lxc.network.type = %s	246	lxc.network.type = %s
125	@@ -216,12 +249,7 @@
126	216	`	249	`
127	217		250
128	218	func networkConfigTemplate(networkType, networkLink string) string {	251	func networkConfigTemplate(networkType, networkLink string) string {
135	219	networkConfig := fmt.Sprintf(networkTemplate, networkType, networkLink)	252	return fmt.Sprintf(networkTemplate, networkType, networkLink)
130	220	if !useRestartDir() {
131	221	networkConfig += "lxc.start.auto = 1\n"
132	222	logger.Tracef("Setting auto start to true in lxc config.")
133	223	}
134	224	return networkConfig
136	225	}	253	}
137	226		254
138	227	func generateNetworkConfig(network *container.NetworkConfig) string {	255	func generateNetworkConfig(network *container.NetworkConfig) string {
139	@@ -240,11 +268,10 @@
140	240	}	268	}
141	241	}	269	}
142	242		270
144	243	func writeLxcConfig(network *container.NetworkConfig, directory, logdir string) (string, error) {	271	func writeLxcConfig(network *container.NetworkConfig, directory string) (string, error) {
145	244	networkConfig := generateNetworkConfig(network)	272	networkConfig := generateNetworkConfig(network)
146	245	configFilename := filepath.Join(directory, "lxc.conf")	273	configFilename := filepath.Join(directory, "lxc.conf")
149	246	configContent := fmt.Sprintf(localConfig, networkConfig, logdir)	274	if err := ioutil.WriteFile(configFilename, []byte(networkConfig), 0644); err != nil {
148	247	if err := ioutil.WriteFile(configFilename, []byte(configContent), 0644); err != nil {
150	248	return "", err	275	return "", err
151	249	}	276	}
152	250	return configFilename, nil	277	return configFilename, nil
153	251		278
154	=== modified file 'container/lxc/lxc_test.go'
155	--- container/lxc/lxc_test.go 2014-03-10 02:51:31 +0000
156	+++ container/lxc/lxc_test.go 2014-03-11 03:19:30 +0000
157	@@ -185,16 +185,18 @@
158	185		185
159	186	manager := s.makeManager(c, "test")	186	manager := s.makeManager(c, "test")
160	187	instance := containertesting.StartContainer(c, manager, "1/lxc/0")	187	instance := containertesting.StartContainer(c, manager, "1/lxc/0")
164	188	autostartLink := lxc.RestartSymlink(string(instance.Id()))	188	name := string(instance.Id())
165	189		189	autostartLink := lxc.RestartSymlink(name)
166	190	config := lxc.NetworkConfigTemplate("foo", "bar")	190	config, err := ioutil.ReadFile(lxc.ContainerConfigFilename(name))
167			191	c.Assert(err, gc.IsNil)
168	191	expected := `	192	expected := `
171	192	lxc.network.type = foo	193	lxc.network.type = veth
172	193	lxc.network.link = bar	194	lxc.network.link = nic42
173	194	lxc.network.flags = up	195	lxc.network.flags = up
174	195	lxc.start.auto = 1	196	lxc.start.auto = 1
175			197	lxc.mount.entry=/var/log/juju var/log/juju none defaults,bind 0 0
176	196	`	198	`
178	197	c.Assert(config, gc.Equals, expected)	199	c.Assert(string(config), gc.Equals, expected)
179	198	c.Assert(autostartLink, jc.DoesNotExist)	200	c.Assert(autostartLink, jc.DoesNotExist)
180	199	}	201	}
181	200		202
182	201		203
183	=== modified file 'container/lxc/mock/mock-lxc.go'
184	--- container/lxc/mock/mock-lxc.go 2013-09-30 01:50:43 +0000
185	+++ container/lxc/mock/mock-lxc.go 2014-03-11 03:19:30 +0000
186	@@ -5,8 +5,12 @@
187	5		5
188	6	import (	6	import (
189	7	"fmt"	7	"fmt"
190			8	"os"
191			9	"path/filepath"
192	8		10
193	9	"launchpad.net/golxc"	11	"launchpad.net/golxc"
194			12
195			13	"launchpad.net/juju-core/utils"
196	10	)	14	)
197	11		15
198	12	// This file provides a mock implementation of the golxc interfaces	16	// This file provides a mock implementation of the golxc interfaces
199	@@ -44,13 +48,15 @@
200	44	}	48	}
201	45		49
202	46	type mockFactory struct {	50	type mockFactory struct {
205	47	instances map[string]golxc.Container	51	containerDir string
206	48	listeners []chan<- Event	52	instances map[string]golxc.Container
207			53	listeners []chan<- Event
208	49	}	54	}
209	50		55
211	51	func MockFactory() ContainerFactory {	56	func MockFactory(containerDir string) ContainerFactory {
212	52	return &mockFactory{	57	return &mockFactory{
214	53	instances: make(map[string]golxc.Container),	58	containerDir: containerDir,
215			59	instances: make(map[string]golxc.Container),
216	54	}	60	}
217	55	}	61	}
218	56		62
219	@@ -74,7 +80,13 @@
220	74	}	80	}
221	75	mock.state = golxc.StateStopped	81	mock.state = golxc.StateStopped
222	76	mock.factory.instances[mock.name] = mock	82	mock.factory.instances[mock.name] = mock
224	77	return nil	83	// Create the container directory.
225			84	containerDir := filepath.Join(mock.factory.containerDir, mock.name)
226			85	if err := os.MkdirAll(containerDir, 0755); err != nil {
227			86	return err
228			87	}
229			88	containerConfig := filepath.Join(containerDir, "config")
230			89	return utils.CopyFile(containerConfig, configFile)
231	78	}	90	}
232	79		91
233	80	// Start runs the container as a daemon.	92	// Start runs the container as a daemon.
234	81		93
235	=== modified file 'container/lxc/testing/test.go'
236	--- container/lxc/testing/test.go 2013-11-11 22:45:29 +0000
237	+++ container/lxc/testing/test.go 2014-03-11 03:19:30 +0000
238	@@ -33,6 +33,6 @@
239	33	s.PatchValue(&lxc.LxcContainerDir, s.LxcDir)	33	s.PatchValue(&lxc.LxcContainerDir, s.LxcDir)
240	34	s.RestartDir = c.MkDir()	34	s.RestartDir = c.MkDir()
241	35	s.PatchValue(&lxc.LxcRestartDir, s.RestartDir)	35	s.PatchValue(&lxc.LxcRestartDir, s.RestartDir)
243	36	s.Factory = mock.MockFactory()	36	s.Factory = mock.MockFactory(s.LxcDir)
244	37	s.PatchValue(&lxc.LxcObjectFactory, s.Factory)	37	s.PatchValue(&lxc.LxcObjectFactory, s.Factory)
245	38	}	38	}