diff --git a/test/data/integration/integration_data.json b/test/data/integration/integration_data.json index 6b5b9007..b2445544 100755 --- a/test/data/integration/integration_data.json +++ b/test/data/integration/integration_data.json @@ -21,7 +21,7 @@ "release_version": "CMSSW_1_2_3", "site": "cmssrm.fnal.gov", "block": "/unittest_web_primary_ds_name_8268/acq_era_8268-v8268/GEN-SIM-RAW#8268", - "parent_block": "/unittest_web_primary_ds_name_8268/acq_era_8268-ptsr-v8268/GEN-SIM-RAW#8268", + "parent_block_name": "/unittest_web_primary_ds_name_8268/acq_era_8268-ptsr-v8268/GEN-SIM-RAW#8268", "files": [], "parent_files": [], "runs": [ @@ -38,4 +38,4 @@ "parent_stepchain_block": "/unittest_web_primary_ds_name_8268_stepchain/acq_era_8268-ptsr-v8268/GEN-SIM-RAW#8268", "stepchain_files": [], "parent_stepchain_files": [] -} \ No newline at end of file +} diff --git a/test/int_blocks.go b/test/int_blocks.go index d9d92c4a..8f3da569 100644 --- a/test/int_blocks.go +++ b/test/int_blocks.go @@ -47,7 +47,7 @@ func getBlocksTestTable(t *testing.T) EndpointTestCase { LAST_MODIFIED_BY: TestData.CreateBy, } parentBlockReq := dbs.Blocks{ - BLOCK_NAME: TestData.ParentBlock, + BLOCK_NAME: TestData.ParentBlockName, ORIGIN_SITE_NAME: TestData.Site, CREATE_BY: TestData.CreateBy, LAST_MODIFIED_BY: TestData.CreateBy, @@ -56,7 +56,7 @@ func getBlocksTestTable(t *testing.T) EndpointTestCase { BLOCK_NAME: TestData.Block, } blockParentResp := blockResponse{ - BLOCK_NAME: TestData.ParentBlock, + BLOCK_NAME: TestData.ParentBlockName, } blockDetailResp := blockDetailResponse{ BlockID: 1, @@ -74,7 +74,7 @@ func getBlocksTestTable(t *testing.T) EndpointTestCase { } blockParentDetailResp := blockDetailResponse{ BlockID: 2, - BlockName: TestData.ParentBlock, + BlockName: TestData.ParentBlockName, BlockSize: 0, CreateBy: TestData.CreateBy, CreationDate: 0, diff --git a/test/int_files.go b/test/int_files.go index 79876379..231bc3b8 100644 --- a/test/int_files.go +++ b/test/int_files.go @@ -197,7 +197,7 @@ func getFilesTestTable(t *testing.T) EndpointTestCase { for i := 1; i <= 10; i++ { parentLFN := fmt.Sprintf("/store/mc/Fall08/BBJets250to500-madgraph/GEN-SIM-RAW/IDEAL_/p%v/%v.root", TestData.UID, i) testDataParentFiles = append(testDataParentFiles, parentLFN) - fileRecord := createFileRecord(i, TestData.ParentDataset, TestData.ParentBlock, parentFileLumiList, parentLFN, []dbs.FileParentLFNRecord{}) + fileRecord := createFileRecord(i, TestData.ParentDataset, TestData.ParentBlockName, parentFileLumiList, parentLFN, []dbs.FileParentLFNRecord{}) parentFiles = append(parentFiles, fileRecord) parentDetailResp = append(parentDetailResp, createFileDetailedResponse(i, 2, 2, fileRecord)) } diff --git a/test/integration_cases.go b/test/integration_cases.go index fdcc70df..9dbf1d9c 100644 --- a/test/integration_cases.go +++ b/test/integration_cases.go @@ -72,7 +72,7 @@ type initialData struct { ReleaseVersion string `json:"release_version"` Site string `json:"site"` Block string `json:"block"` - ParentBlock string `json:"parent_block"` + ParentBlockName string `json:"parent_block_name"` Files []string `json:"files"` ParentFiles []string `json:"parent_files"` Runs []int `json:"runs"` @@ -189,7 +189,7 @@ func generateBaseData(t *testing.T, filepath string) { TestData.ReleaseVersion = release_version TestData.Site = site TestData.Block = block - TestData.ParentBlock = parent_block + TestData.ParentBlockName = parent_block TestData.Files = []string{} TestData.ParentFiles = []string{} TestData.Runs = []int{97, 98, 99}