LEFT | RIGHT |
1 // Copyright 2012, 2013 Canonical Ltd. | 1 // Copyright 2012, 2013 Canonical Ltd. |
2 // Licensed under the AGPLv3, see LICENCE file for details. | 2 // Licensed under the AGPLv3, see LICENCE file for details. |
3 | 3 |
4 package main | 4 package main |
5 | 5 |
6 import ( | 6 import ( |
7 "os" | 7 "os" |
8 "path/filepath" | 8 "path/filepath" |
9 "reflect" | 9 "reflect" |
10 "strings" | 10 "strings" |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 calledChan := make(chan struct{}, 1) | 408 calledChan := make(chan struct{}, 1) |
409 s.PatchValue(&useMultipleCPUs, func() { calledChan <- struct{}{} }) | 409 s.PatchValue(&useMultipleCPUs, func() { calledChan <- struct{}{} }) |
410 // Now, start the agent, and observe that a JobManageEnviron agent | 410 // Now, start the agent, and observe that a JobManageEnviron agent |
411 // calls UseMultipleCPUs | 411 // calls UseMultipleCPUs |
412 a := s.newAgent(c, m) | 412 a := s.newAgent(c, m) |
413 defer a.Stop() | 413 defer a.Stop() |
414 go func() { | 414 go func() { |
415 c.Check(a.Run(nil), gc.IsNil) | 415 c.Check(a.Run(nil), gc.IsNil) |
416 }() | 416 }() |
417 // Wait for configuration to be finished | 417 // Wait for configuration to be finished |
418 » <-a.workersStarted | 418 » <-a.WorkersStarted() |
419 select { | 419 select { |
420 case <-calledChan: | 420 case <-calledChan: |
421 case <-time.After(coretesting.LongWait): | 421 case <-time.After(coretesting.LongWait): |
422 c.Errorf("we failed to call UseMultipleCPUs()") | 422 c.Errorf("we failed to call UseMultipleCPUs()") |
423 } | 423 } |
424 c.Check(a.Stop(), gc.IsNil) | 424 c.Check(a.Stop(), gc.IsNil) |
425 // However, an agent that just JobHostUnits doesn't call UseMultipleCPUs | 425 // However, an agent that just JobHostUnits doesn't call UseMultipleCPUs |
426 m2, _, _ := s.primeAgent(c, version.Current, state.JobHostUnits) | 426 m2, _, _ := s.primeAgent(c, version.Current, state.JobHostUnits) |
427 s.setFakeMachineAddresses(c, m2) | 427 s.setFakeMachineAddresses(c, m2) |
428 a2 := s.newAgent(c, m2) | 428 a2 := s.newAgent(c, m2) |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
889 return err == nil && placeholder.String() == curl.WithRevision(2
3).String() | 889 return err == nil && placeholder.String() == curl.WithRevision(2
3).String() |
890 } | 890 } |
891 success := false | 891 success := false |
892 for attempt := coretesting.LongAttempt.Start(); attempt.Next(); { | 892 for attempt := coretesting.LongAttempt.Start(); attempt.Next(); { |
893 if success = checkRevision(); success { | 893 if success = checkRevision(); success { |
894 break | 894 break |
895 } | 895 } |
896 } | 896 } |
897 c.Assert(success, gc.Equals, true) | 897 c.Assert(success, gc.Equals, true) |
898 } | 898 } |
LEFT | RIGHT |