Merge pull request #37118 from Dr15Jones/silentPythonTests

Removed excess printing in FWCore/ParameterSet tests
cms-sw · Mar 3, 2022 · 9ecd969 · 9ecd969
2 parents 7e86ea4 + e0e6785
commit 9ecd969
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 135 deletions.
diff --git a/FWCore/ParameterSet/python/Mixins.py b/FWCore/ParameterSet/python/Mixins.py
@@ -219,7 +219,6 @@ def getParameter(self, params):
             return getattr(self, params, None)
         for param in params:
             lastParam = getattr(lastParam, param, None)
-            print(str(lastParam))
             if lastParam == None:
                 return None
         return lastParam

diff --git a/FWCore/ParameterSet/python/OrderedSet.py b/FWCore/ParameterSet/python/OrderedSet.py
@@ -86,8 +86,15 @@ def __eq__(self, other):
 
 
 if __name__ == '__main__':
-    s = OrderedSet('abracadaba')
-    t = OrderedSet('simsalabim')
-    print((s | t))
-    print((s & t))
-    print(s - t)
+    import unittest
+    class TestModuleCommand(unittest.TestCase):
+        def setUp(self):
+            """Nothing to do """
+            pass
+        def testSetOperations(self):
+            s = OrderedSet('abracadaba')
+            t = OrderedSet('simsalabim')
+            self.assertEqual(str((s | t)), "OrderedSet(['a', 'b', 'r', 'c', 'd', 's', 'i', 'm', 'l'])")
+            self.assertEqual(str((s & t)), "OrderedSet(['a', 'b'])")
+            self.assertEqual(str(s - t),"OrderedSet(['r', 'c', 'd'])")
+    unittest.main()
diff --git a/FWCore/ParameterSet/python/printPaths.py b/FWCore/ParameterSet/python/printPaths.py
diff --git a/FWCore/ParameterSet/python/usedOutput.py b/FWCore/ParameterSet/python/usedOutput.py