Fix logic error that broke test sharding

This commit is contained in:
David Dworken
2024-02-10 23:02:29 -08:00
parent c97f381546
commit f20b2a08c4

View File

@ -61,7 +61,7 @@ var shellTesters []shellTester = []shellTester{bashTester{}, zshTester{}}
func numTestShards() int { func numTestShards() int {
numTestShardsStr := os.Getenv("NUM_TEST_SHARDS") numTestShardsStr := os.Getenv("NUM_TEST_SHARDS")
if numTestShardsStr == "" { if numTestShardsStr == "" {
return 0 return -1
} }
numTestShards, err := strconv.Atoi(numTestShardsStr) numTestShards, err := strconv.Atoi(numTestShardsStr)
if err != nil { if err != nil {
@ -73,7 +73,7 @@ func numTestShards() int {
func currentShardNumber() int { func currentShardNumber() int {
currentShardNumberStr := os.Getenv("CURRENT_SHARD_NUM") currentShardNumberStr := os.Getenv("CURRENT_SHARD_NUM")
if currentShardNumberStr == "" { if currentShardNumberStr == "" {
return 0 return -1
} }
currentShardNumber, err := strconv.Atoi(currentShardNumberStr) currentShardNumber, err := strconv.Atoi(currentShardNumberStr)
if err != nil { if err != nil {
@ -83,13 +83,13 @@ func currentShardNumber() int {
} }
func isShardedTestRun() bool { func isShardedTestRun() bool {
return numTestShards() != 0 && currentShardNumber() != 0 return numTestShards() != -1 && currentShardNumber() != -1
} }
func markTestForSharding(t *testing.T, testShardNumber int) { func markTestForSharding(t *testing.T, testShardNumber int) {
fmt.Printf("DDWORKENDEBUG: markTestForSharding: isShardedTestRun()=%#v testShardNumber=%#v numTestShards()=%#v currentShardNumber()=%#v", isShardedTestRun(), testShardNumber, numTestShards(), currentShardNumber()) fmt.Printf("DDWORKENDEBUG: markTestForSharding: isShardedTestRun()=%#v testShardNumber=%#v numTestShards()=%#v currentShardNumber()=%#v", isShardedTestRun(), testShardNumber, numTestShards(), currentShardNumber())
if isShardedTestRun() { if isShardedTestRun() {
if testShardNumber%numTestShards() == currentShardNumber() { if testShardNumber%numTestShards() != currentShardNumber() {
t.Skip("Skipping sharded test") t.Skip("Skipping sharded test")
} }
} }