Merge branch '21146-pysdk-new-websockets'

[arvados.git] / lib / dispatchcloud / dispatcher_test.go

diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index 33d7f4e9acd2e5e15293faffefd4d2667e2899f7..51c2c3d6a35543cf586f30daac39a0822ad5a90e 100644 (file)
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -208,7 +208,7 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) {
                return int(rand.Uint32() & 0x3)
        }
        var countCapacityErrors int64
-       n := 0
+       vmCount := int32(0)
        s.stubDriver.Queue = queue
        s.stubDriver.SetupVM = func(stubvm *test.StubVM) error {
                if pt := stubvm.Instance().ProviderType(); pt == test.InstanceType(6).ProviderType {
@@ -216,7 +216,8 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) {
                        atomic.AddInt64(&countCapacityErrors, 1)
                        return test.CapacityError{InstanceTypeSpecific: true}
                }
-               n++
+               n := atomic.AddInt32(&vmCount, 1)
+               c.Logf("SetupVM: instance %s n=%d", stubvm.Instance(), n)
                stubvm.Boot = time.Now().Add(time.Duration(rand.Int63n(int64(5 * time.Millisecond))))
                stubvm.CrunchRunDetachDelay = time.Duration(rand.Int63n(int64(10 * time.Millisecond)))
                stubvm.ExecuteContainer = executeContainer
@@ -238,7 +239,7 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) {
                        // 1 instance is completely broken, ensuring
                        // the boot_outcomes{outcome="failure"} metric
                        // is not zero
-                       stubvm.CrunchRunCrashRate = 1
+                       stubvm.Broken = time.Now()
                default:
                        stubvm.CrunchRunCrashRate = 0.1
                        stubvm.ArvMountDeadlockRate = 0.1