projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
20b7c37
)
6260: Simplify verifyBlocks logic.
author
Tom Clegg <tom@curoverse.com>
Wed, 9 Sep 2015 19:09:46 +0000
(15:09 -0400)
committer
Tom Clegg <tom@curoverse.com>
Wed, 9 Sep 2015 19:10:08 +0000
(15:10 -0400)
services/datamanager/datamanager_test.go
patch
|
blob
|
history
diff --git
a/services/datamanager/datamanager_test.go
b/services/datamanager/datamanager_test.go
index 18b302a5ba68580568016a29720bbbc6185cf747..c76d481f2362269f0d85c2242cd09c4fd61a76cd 100644
(file)
--- a/
services/datamanager/datamanager_test.go
+++ b/
services/datamanager/datamanager_test.go
@@
-207,31
+207,24
@@
func getBlockIndexes(t *testing.T) [][]string {
func verifyBlocks(t *testing.T, notExpected []string, expected []string) {
blocks := getBlockIndexes(t)
func verifyBlocks(t *testing.T, notExpected []string, expected []string) {
blocks := getBlockIndexes(t)
+
for _, block := range notExpected {
for _, block := range notExpected {
- for i := 0; i < len(blocks); i++ {
- exists := valueInArray(block, blocks[i])
- if exists {
- t.Fatalf("Found unexpected block in index %s", block)
+ for _, idx := range blocks {
+ if valueInArray(block, idx) {
+ t.Fatalf("Found unexpected block %s", block)
}
}
}
}
}
}
- // var blockExists [][]string
- blockExists := make(map[string][]string)
for _, block := range expected {
for _, block := range expected {
- var blockArray []string
- for i := 0; i < len(blocks); i++ {
- exists := valueInArray(block, blocks[i])
- if exists {
- blockArray = append(blockArray, block)
+ nFound := 0
+ for _, idx := range blocks {
+ if valueInArray(block, idx) {
+ nFound++
}
}
}
}
- blockExists[block] = blockArray
- }
-
- for _, block := range expected {
- if blockExists[block] == nil || len(blockExists[block]) < 2 {
- t.Fatalf("Expected to find two replicas for block %s; found %d", block, len(blockExists[block]))
+ if nFound < 2 {
+ t.Fatalf("Found %d replicas of block %s, expected >= 2", nFound, block)
}
}
}
}
}
}