Generated cfi files now may use new module syntax

- denote if must use full type info when dumping to cfi
- test module now makes explicit named cfi files compatible with default

Author: Dr15Jones

FWCore/Integration/plugins/ProducerWithPSetDesc.cc

@@ -0,0 +1,2 @@
+from .testProducerWithPsetDesc_cfi import testProducerWithPsetDesc
+print(testProducerWithPsetDesc.dumpPython())

FWCore/Integration/test/cfi_dumpPython.py

@@ -34,7 +34,13 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   cmsRun ${LOCAL_TEST_DIR}/runAutoGeneratedCfi_cfg.py || die "cmsRun runAutoGeneratedCfi_cfg.py" $?
 
 # Compare the cfi file to a reference file to ensure it is correct
-  diff ./testProducerWithPsetDesc_cfi.py ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_cfi.py || die "comparing testProducerWithPsetDesc_cfi.py" $?
+  mkdir testcfi
+  cp ${LOCAL_TEST_DIR}/cfi_dumpPython.py testcfi
+  cp testProducerWithPsetDesc_cfi.py testcfi
+  cp ProducerWithPSetDesc.py testcfi
+  PYTHON3PATH=${PWD}:${PYTHON3PATH} python3 -m testcfi.cfi_dumpPython > dumpPython.log
+  python3 ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_cfi.py > dumpPython_ref.log
+  diff ./dumpPython.log dumpPython_ref.log || die "comparing testProducerWithPsetDesc_cfi.py" $?
 
 # This time try a cfi without any of the required parameters to test that we properly insert
 # required missing parameters into the ParameterSet

FWCore/Integration/test/run_ParameterSet.sh

@@ -373,3 +373,5 @@
   ),
   mightGet = cms.optional.untracked.vstring
 )
+
+print(testProducerWithPsetDesc.dumpPython())