Index: worker/machiner/machiner_test.go |
=== modified file 'worker/machiner/machiner_test.go' |
--- worker/machiner/machiner_test.go 2012-08-17 09:49:58 +0000 |
+++ worker/machiner/machiner_test.go 2012-09-12 16:41:30 +0000 |
@@ -25,18 +25,11 @@ |
m, err := s.State.AddMachine() |
c.Assert(err, IsNil) |
- p := machiner.NewMachiner(m) |
+ p := machiner.NewMachiner(m, c.MkDir()) |
c.Assert(p.Stop(), IsNil) |
} |
func (s *MachinerSuite) TestMachinerDeployDestroy(c *C) { |
- dcontainer := newDummyContainer() |
- backup := container.Simple |
- container.Simple = dcontainer |
- defer func() { |
- container.Simple = backup |
- }() |
- |
dummyCharm := s.AddTestingCharm(c, "dummy") |
loggingCharm := s.AddTestingCharm(c, "logging") |
@@ -65,7 +58,8 @@ |
err = ud0.AssignToMachine(m0) |
c.Assert(err, IsNil) |
- machiner := machiner.NewMachiner(m0) |
+ dcontainer := newDummyContainer() |
+ machiner := machiner.NewMachinerWithContainer(m0, dcontainer) |
tests := []struct { |
change func() |
@@ -117,6 +111,8 @@ |
action chan string |
} |
+var _ container.Container = (*dummyContainer)(nil) |
+ |
func newDummyContainer() *dummyContainer { |
return &dummyContainer{ |
make(chan string, 5), |