[ARVADOS] updated: 165ff02bc60935446ffc13e59953b5799ba747c5

[git at public.curoverse.com]

Summary of changes:
 services/datamanager/datamanager_test.go | 37 ++++++++++++--------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

       via  165ff02bc60935446ffc13e59953b5799ba747c5 (commit)
      from  e1c0499b7f75c98d2a5450358546e10ffd06faac (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 165ff02bc60935446ffc13e59953b5799ba747c5
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 20 17:34:34 2015 -0500

    7255: rename test and update comments.

diff --git a/services/datamanager/datamanager_test.go b/services/datamanager/datamanager_test.go
index 5ed2b4f..28faf98 100644
--- a/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@ -258,13 +258,10 @@ func valueInArray(value string, list []string) bool {
 	return false
 }
 
-/*
-Test env uses two keep volumes. The volume names can be found by reading the files
-  ARVADOS_HOME/tmp/keep0.volume and ARVADOS_HOME/tmp/keep1.volume
-
-The keep volumes are of the dir structure:
-  volumeN/subdir/locator
-*/
+// Test env uses two keep volumes. The volume names can be found by reading the files
+// ARVADOS_HOME/tmp/keep0.volume and ARVADOS_HOME/tmp/keep1.volume
+//
+// The keep volumes are of the dir structure: volumeN/subdir/locator
 func backdateBlocks(t *testing.T, oldUnusedBlockLocators []string) {
 	// First get rid of any size hints in the locators
 	var trimmedBlockLocators []string
@@ -346,11 +343,9 @@ func waitUntilQueuesFinishWork(t *testing.T) {
 	}
 }
 
-/*
-Create some blocks and backdate some of them.
-Also create some collections and delete some of them.
-Verify block indexes.
-*/
+// Create some blocks and backdate some of them.
+// Also create some collections and delete some of them.
+// Verify block indexes.
 func TestPutAndGetBlocks(t *testing.T) {
 	defer TearDownDataManagerTest(t)
 	SetupDataManagerTest(t)
@@ -551,11 +546,9 @@ func TestPutAndGetBlocks_ErrorDuringGetCollectionsBadHeapProfileFilename(t *test
 	testOldBlocksNotDeletedOnDataManagerError(t, "", "/badheapprofilefile", true, true)
 }
 
-/*
-  Create some blocks and backdate some of them.
-  Run datamanager while producing an error condition.
-  Verify that the blocks are hence not deleted.
-*/
+// Create some blocks and backdate some of them.
+// Run datamanager while producing an error condition.
+// Verify that the blocks are hence not deleted.
 func testOldBlocksNotDeletedOnDataManagerError(t *testing.T, writeDataTo string, heapProfileFile string, expectError bool, expectOldBlocks bool) {
 	defer TearDownDataManagerTest(t)
 	SetupDataManagerTest(t)
@@ -628,12 +621,10 @@ func createMultiStreamBlockCollection(t *testing.T, data string, numStreams, num
 	return collection["uuid"].(string), locs
 }
 
-/*
-  Create collection with multiple streams and blocks; backdate the blocks and but do not delete the collection.
-  Also, create stray block and backdate it.
-  After datamanager run: expect blocks from the collection, but not the stray block.
-*/
-func TestPutAndGetCollectionsWithMultipleStreamsAndBlocks(t *testing.T) {
+// Create collection with multiple streams and blocks; backdate the blocks and but do not delete the collection.
+// Also, create stray block and backdate it.
+// After datamanager run: expect blocks from the collection, but not the stray block.
+func TestManifestWithMultipleStreamsAndBlocks(t *testing.T) {
 	defer TearDownDataManagerTest(t)
 	SetupDataManagerTest(t)
 

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


hooks/post-receive
--