[ARVADOS] updated: 44321d4b5e7677df2ad70d88db6358b2778b58e5

[git at public.curoverse.com]

Summary of changes:
 doc/_includes/_install_ruby_and_bundler.liquid     |  2 +-
 doc/install/install-api-server.html.textile.liquid | 27 ++++++++--------
 sdk/python/arvados/arvfile.py                      |  2 +-
 services/datamanager/datamanager_test.go           | 37 +++++++++++++++-------
 .../arvnodeman/computenode/driver/azure.py         | 14 ++++++++
 services/nodemanager/doc/azure.example.cfg         |  1 +
 services/nodemanager/setup.py                      |  4 +--
 7 files changed, 58 insertions(+), 29 deletions(-)

       via  44321d4b5e7677df2ad70d88db6358b2778b58e5 (commit)
       via  9d7fe0af0a9c7cee773bfb8168f30790095e0389 (commit)
       via  76e8998d9326da7d99bcf083bd7234d62c2af63c (commit)
       via  9d7829ad345d6199149762f14f491e266af7e8eb (commit)
       via  b87fa03691e188df52756608c9bff4e00d8ec290 (commit)
       via  102d938387b2bbfe5b2e7bd9b8267b767a15719b (commit)
       via  8099379a9d74e9292464cdc1aa326a726633288e (commit)
       via  907343b7176738987b26b542664578ee0d8b23f1 (commit)
       via  1ea2c826b7839340f377ed5d41dce3af01c67023 (commit)
       via  eebcb59b9aeeae8a1936fba15270e1f1f7b8487e (commit)
       via  a52ab8066f7db20fc5b74fdb8789453cf32ba872 (commit)
       via  1ff72a23c54376ac40b94ed6d4fcf6b23e08feb4 (commit)
       via  1afb514035257fa921f251ac1556a19c71b608f0 (commit)
      from  5189cc86935ba95ea083873a607a2a5d1b26919f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 44321d4b5e7677df2ad70d88db6358b2778b58e5
Merge: 9d7fe0a 76e8998
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 8 17:30:48 2015 -0400

    Merge branch 'master' into 6260-test-datamanager


commit 9d7fe0af0a9c7cee773bfb8168f30790095e0389
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 8 17:30:14 2015 -0400

    6260: look for two replicas

diff --git a/services/datamanager/datamanager_test.go b/services/datamanager/datamanager_test.go
index de9e7b1..39e545d 100644
--- a/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@ -40,7 +40,7 @@ func SetupDataManagerTest(t *testing.T) {
 	// keep client
 	keepClient = &keepclient.KeepClient{
 		Arvados:       &arv,
-		Want_replicas: 1,
+		Want_replicas: 2,
 		Using_proxy:   true,
 		Client:        &http.Client{},
 	}
@@ -198,11 +198,11 @@ func getBlockIndexesForServer(t *testing.T, i int) []string {
 	return indexes
 }
 
-func getBlockIndexes(t *testing.T) []string {
-	var indexes []string
+func getBlockIndexes(t *testing.T) [][]string {
+	var indexes [][]string
 
 	for i := 0; i < len(keepServers); i++ {
-		indexes = append(indexes, getBlockIndexesForServer(t, i)...)
+		indexes = append(indexes, getBlockIndexesForServer(t, i))
 	}
 	return indexes
 }
@@ -210,15 +210,30 @@ func getBlockIndexes(t *testing.T) []string {
 func verifyBlocks(t *testing.T, notExpected []string, expected []string) {
 	blocks := getBlockIndexes(t)
 	for _, block := range notExpected {
-		exists := valueInArray(block, blocks)
-		if exists {
-			t.Fatalf("Found unexpected block in index %s", block)
+		for i := 0; i < len(blocks); i++ {
+			exists := valueInArray(block, blocks[i])
+			if exists {
+				t.Fatalf("Found unexpected block in index %s", block)
+			}
 		}
 	}
+
+	//	var blockExists [][]string
+	blockExists := make(map[string][]string)
 	for _, block := range expected {
-		exists := valueInArray(block, blocks)
-		if !exists {
-			t.Fatalf("Did not find expected block in index %s", block)
+		var blockArray []string
+		for i := 0; i < len(blocks); i++ {
+			exists := valueInArray(block, blocks[i])
+			if exists {
+				blockArray = append(blockArray, block)
+			}
+		}
+		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]))
 		}
 	}
 }
@@ -411,8 +426,6 @@ func TestPutAndGetBlocks(t *testing.T) {
 
 	verifyBlocks(t, nil, expected)
 
-	log.Print("Backdating blocks and deleting collection now")
-
 	// Backdate the to-be old blocks and delete the collections
 	backdateBlocks(t, oldUnusedBlockLocators)
 	deleteCollection(t, toBeDeletedCollectionUuid)

-----------------------------------------------------------------------


hooks/post-receive
--