Add tests

Author: makortel

Utilities/StorageFactory/test/BuildFile.xml

@@ -42,4 +42,6 @@ to wait until the framework decides on a threading model to implement a fix.
 file="threadsafe.cpp" name="test_StorageFactory_threadsafe"
 -->
 
+<test name="test_StorageFactory_StorageProxies" command="test_storageproxies.sh"/>
+
 <test name="test_StorageFactory_edmStorageTrace" command="python3 ${LOCALTOP}/src/Utilities/StorageFactory/scripts/edmStorageTrace.py --test"/>

Utilities/StorageFactory/test/test_storageproxies.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Pass in name and status
+function die { echo $1: status $2 ;  exit $2; }
+
+cmsRun ${SCRAM_TEST_PATH}/test_storageproxy_make_file_cfg.py || die "cmsRun test_storageproxy_make_file_cfg.py failed" $?
+
+cmsRun ${SCRAM_TEST_PATH}/test_storageproxy_test_cfg.py || die "cmsRun test_storageproxy_test_cfg.py failed" $?
+
+cmsRun ${SCRAM_TEST_PATH}/test_storageproxy_test_cfg.py --latencyRead || die "cmsRun test_storageproxy_test_cfg.py --latencyRead failed" $?
+cmsRun ${SCRAM_TEST_PATH}/test_storageproxy_test_cfg.py --latencyWrite || die "cmsRun test_storageproxy_test_cfg.py --latencyWrite failed" $?
+
+cmsRun ${SCRAM_TEST_PATH}/test_storageproxy_test_cfg.py --trace || die "cmsRun test_storageproxy_test_cfg.py --trace failed" $?
+grep -q "o .* test.root" trace_0.txt || die "File open entry missing in trace_0.txt" $?
+grep -q "r " trace_0.txt || die "No read entries in trace_0.txt" $?
+grep -q "o .* output.root" trace_1.txt || die "File open entry missing in trace_1.txt" $?
+grep -q "w " trace_1.txt || die "No write entries in trace_0.txt" $?
+
+edmStorageTrace.py --summary trace_0.txt | grep -q "Singular reads" || die "No reads in summary for trace_0.txt" $?
+edmStorageTrace.py --summary trace_1.txt | grep -q "Singular writes" || die "No reads in summary for trace_1.txt" $?
+
+
+cmsRun ${SCRAM_TEST_PATH}/test_storageproxy_test_cfg.py --trace --latencyRead || die "cmsRun test_storageproxy_test_cfg.py --trace --latencyRead failed" $?
+edmStorageTrace.py --summary trace_0.txt | grep -q "Duration .* ms" || die "Read duration has non-ms units in trace_1.txt" $?
+
+cmsRun ${SCRAM_TEST_PATH}/test_storageproxy_test_cfg.py --trace --latencyWrite || die "cmsRun test_storageproxy_test_cfg.py --trace --latencyWrite failed" $?
+edmStorageTrace.py --summary trace_1.txt | grep -q "Duration .* ms" || die "Write duration has non-ms trace_1.txt" $?

Utilities/StorageFactory/test/test_storageproxy_make_file_cfg.py

@@ -0,0 +1,16 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("MAKE")
+
+process.source = cms.Source("EmptySource")
+process.maxEvents.input = 10
+
+process.out = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string("test.root"))
+
+process.Thing = cms.EDProducer("ThingProducer")
+process.OtherThing = cms.EDProducer("OtherThingProducer")
+process.EventNumber = cms.EDProducer("EventNumberIntProducer")
+
+
+process.o = cms.EndPath(process.out, cms.Task(process.Thing, process.OtherThing, process.EventNumber))
+

Utilities/StorageFactory/test/test_storageproxy_test_cfg.py

@@ -0,0 +1,40 @@
+import FWCore.ParameterSet.Config as cms
+
+import argparse
+
+parser = argparse.ArgumentParser(description="Test storage proxies")
+parser.add_argument("--trace", action="store_true", help="Enable StorageTraceProxy")
+parser.add_argument("--latencyRead", action="store_true", help="Add read latency")
+parser.add_argument("--latencyWrite", action="store_true", help="Add write latency")
+args = parser.parse_args()
+
+process = cms.Process("TEST")
+
+process.source = cms.Source("PoolSource",
+    fileNames = cms.untracked.vstring("file:test.root")
+)
+
+process.out = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string("output.root"))
+
+adaptor = cms.Service("AdaptorConfig", storageProxies = cms.untracked.VPSet())
+if args.latencyRead:
+    adaptor.storageProxies.append(cms.PSet(
+        type = cms.untracked.string("StorageAddLatencyProxy"),
+        read = cms.untracked.uint32(100),
+        readv = cms.untracked.uint32(100),
+    ))
+if args.latencyWrite:
+    adaptor.storageProxies.append(cms.PSet(
+        type = cms.untracked.string("StorageAddLatencyProxy"),
+        write = cms.untracked.uint32(100),
+        writev = cms.untracked.uint32(100),
+    ))
+if args.trace:
+    adaptor.storageProxies.append(cms.PSet(
+        type = cms.untracked.string("StorageTracerProxy"),
+        traceFilePattern = cms.untracked.string("trace_%I.txt"),
+    ))
+
+process.add_(adaptor)
+
+process.ep = cms.EndPath(process.out)