Merge cockroachdb#34652

34652: partitionccl: skip TestInitialPartitioning on testshort r=andreimatei a=andreimatei It's taking half a core for 117s on my laptop. Release note: None Co-authored-by: Andrei Matei <[email protected]>
ajwerner · Feb 6, 2019 · 1092e02 · 1092e02
2 parents d104dce + da86fb6
commit 1092e02
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/ccl/partitionccl/partition_test.go b/pkg/ccl/partitionccl/partition_test.go
@@ -1158,7 +1158,10 @@ func TestInitialPartitioning(t *testing.T) {
 	// This test configures many sub-tests and is too slow to run under nightly
 	// race stress.
 	if testutils.NightlyStress() && util.RaceEnabled {
-		t.Skip()
+		t.Skip("too big for nightly stress race")
+	}
+	if testing.Short() {
+		t.Skip("short")
 	}
 
 	rng, _ := randutil.NewPseudoRand()