diff --git a/test/python/Utils_t/Utilities_t.py b/test/python/Utils_t/Utilities_t.py index d416e965fc4..96ac6bba69f 100644 --- a/test/python/Utils_t/Utilities_t.py +++ b/test/python/Utils_t/Utilities_t.py @@ -8,7 +8,7 @@ from Utils.Utilities import makeList, makeNonEmptyList, strToBool, \ safeStr, rootUrlJoin, zipEncodeStr, lowerCmsHeaders, getSize, \ - encodeUnicodeToBytes, diskUse, numberCouchProcess, orderVersionList + encodeUnicodeToBytes, diskUse, numberCouchProcess class UtilitiesTests(unittest.TestCase): @@ -180,16 +180,6 @@ def testNumberCouchProcess(self): # there should be at least one process, but who knows... self.assertTrue(data >= 0) - def testOrderVersionList(self): - """ - Test the `orderVersionList` function. - """ - oldL = ["2.3.1", "1.2.3", "3.2.1", "1.3.2", "1.2"] - newL = ["1.2", "1.2.3", "1.3.2", "2.3.1", "3.2.1"] - with self.assertRaises(AssertionError): - self.assertListEqual(oldL, newL) - self.assertListEqual(orderVersionList(oldL), newL) - if __name__ == '__main__': unittest.main() diff --git a/test/python/WMCore_t/BossAir_t/BasePlugin_t.py b/test/python/WMCore_t/BossAir_t/BasePlugin_t.py index 4b37a385049..8442f588f08 100644 --- a/test/python/WMCore_t/BossAir_t/BasePlugin_t.py +++ b/test/python/WMCore_t/BossAir_t/BasePlugin_t.py @@ -85,10 +85,11 @@ def testCudaCapabilityToSingleVersion(self): bp = BasePlugin(config=None) # bad input - self.assertEqual(bp.cudaCapabilityToSingleVersion([]), 0) - self.assertEqual(bp.cudaCapabilityToSingleVersion({}), 0) - self.assertEqual(bp.cudaCapabilityToSingleVersion(None), 0) + self.assertEqual(bp.cudaCapabilityToSingleVersion([]), None) + self.assertEqual(bp.cudaCapabilityToSingleVersion({}), None) + self.assertEqual(bp.cudaCapabilityToSingleVersion(None), None) # good and expected input + self.assertEqual(bp.cudaCapabilityToSingleVersion(["5.0"]), 5000) unorderedL = ["2.3.1", "1.2.3", "3.2.1", "1.3.2", "1.2"] self.assertEqual(bp.cudaCapabilityToSingleVersion(unorderedL), 1020) orderedL = ["1.2", "1.2.3", "1.3.2", "2.3.1", "3.2.1"]