diff options
5 files changed, 29 insertions, 29 deletions
diff --git a/src/software/lmi/software/core/Job.py b/src/software/lmi/software/core/Job.py index 697a6f5..911fc53 100644 --- a/src/software/lmi/software/core/Job.py +++ b/src/software/lmi/software/core/Job.py @@ -709,8 +709,8 @@ def modify_instance(instance): "deleteoncompletion" : "delete_on_completion", "timebeforeremoval" : "time_before_removal" } - metadata_props = set(("name")) - reschedule_props = set(("delete_on_completion", "time_before_removal")) + metadata_props = set(("name",)) + reschedule_props = set(("delete_on_completion", "time_before_removal",)) for name, prop in instance.properties.items(): if prop is None: LOG().warn('property "%s" is None', name) diff --git a/src/software/lmi/software/yumdb/jobmanager.py b/src/software/lmi/software/yumdb/jobmanager.py index b133e8e..c064583 100644 --- a/src/software/lmi/software/yumdb/jobmanager.py +++ b/src/software/lmi/software/yumdb/jobmanager.py @@ -168,7 +168,7 @@ class JobIndicationSender(object): :param list indication_ids: Can be even single id. """ if isinstance(indication_ids, basestring): - indication_ids = set((indication_ids)) + indication_ids = set((indication_ids,)) self._indications = set(indication_ids) @cmpi_logging.trace_method @@ -177,7 +177,7 @@ class JobIndicationSender(object): Add filter IDs. """ if isinstance(indication_ids, basestring): - indication_ids = set((indication_ids)) + indication_ids = set((indication_ids,)) self._indications.update(indication_ids) @cmpi_logging.trace_method diff --git a/src/software/test/test_hosted_software_identity_resource.py b/src/software/test/test_hosted_software_identity_resource.py index aa99f90..b9b0590 100644 --- a/src/software/test/test_hosted_software_identity_resource.py +++ b/src/software/test/test_hosted_software_identity_resource.py @@ -157,7 +157,7 @@ class TestHostedSoftwareIdentityResource(swbase.SwTestCase): self.assertCIMNameEqual(ref.path, objpath.Dependent) self.assertEqual(set(ref.path.key_properties()), set(("CreationClassName", "Name", - "SystemCreationClassName", "SystemName"))) + "SystemCreationClassName", "SystemName",))) if repo.status: self.assertEqual(ref.EnabledState, ENABLED_STATE_ENABLED, "EnabledState does not match for repo %s" % repo.repoid) @@ -196,7 +196,7 @@ class TestHostedSoftwareIdentityResource(swbase.SwTestCase): self.assertCIMNameEqual(objpath.Dependent, ref) self.assertEqual(set(ref.key_properties()), set(("CreationClassName", "Name", - "SystemCreationClassName", "SystemName"))) + "SystemCreationClassName", "SystemName",))) repos.remove(ref.Name) self.assertEqual(len(repos), 0) diff --git a/src/software/test/test_resource_for_software_identity.py b/src/software/test/test_resource_for_software_identity.py index 651d7c6..c43cb1b 100644 --- a/src/software/test/test_resource_for_software_identity.py +++ b/src/software/test/test_resource_for_software_identity.py @@ -234,7 +234,7 @@ class TestResourceForSoftwareIdentity(swbase.SwTestCase): self.assertEqual(ref.classname, "LMI_SoftwareIdentityResource") self.assertEqual(set(ref.key_properties()), set(("SystemCreationClassName", "SystemName", - "Name", "CreationClassName"))) + "Name", "CreationClassName",))) self.assertEqual(ref.Name, pkg.repoid, 'Repository name does not match for pkg "%s"' % pkg.nevra) @@ -269,7 +269,7 @@ class TestResourceForSoftwareIdentity(swbase.SwTestCase): self.assertEqual(ref.classname, "LMI_SoftwareIdentityResource") self.assertEqual(set(ref.path.key_properties()), set(("SystemCreationClassName", "SystemName", - "Name", "CreationClassName"))) + "Name", "CreationClassName",))) self.assertEqual(ref.Name, pkg.repoid, 'Repository name does not match for pkg "%s"' % pkg.nevra) diff --git a/src/software/test/test_software_identity_file_check.py b/src/software/test/test_software_identity_file_check.py index b1d278d..b059fb7 100644 --- a/src/software/test/test_software_identity_file_check.py +++ b/src/software/test/test_software_identity_file_check.py @@ -205,7 +205,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): os.lchown(filepath, inst.UserIDOriginal, inst.GroupIDOriginal) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_TARGET))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_TARGET,))) self.assertGreater(len(inst.LinkTarget), len(inst.LinkTargetOriginal)) self.assertTrue(inst.FileExists, @@ -374,7 +374,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): os.chmod(filepath, 0644) self.assertTrue(os.path.exists(filepath)) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_DEVNUM))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_DEVNUM,))) self.assertEqual(inst.FileMode, stats.st_mode) def check_filepath(self, pkg, filepath): @@ -565,47 +565,47 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): self.assertEqual(inst.FileMode, stat.S_IFREG | 0666) self.assertEqual(set(inst.FileModeFlags), set(( FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR, - FILE_MODE_WOTH, FILE_MODE_WGRP, FILE_MODE_WUSR))) + FILE_MODE_WOTH, FILE_MODE_WGRP, FILE_MODE_WUSR,))) objpath.wrapped_object["Name"] = permsdir + 'r--r--r--' inst = objpath.to_instance() self.assertEqual(inst.FileMode, stat.S_IFREG | 0444) self.assertEqual(set(inst.FileModeFlags), set(( - FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR))) + FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR,))) objpath.wrapped_object["Name"] = permsdir + 'r-xr-xr-x' inst = objpath.to_instance() self.assertEqual(inst.FileMode, stat.S_IFREG | 0555) self.assertEqual(set(inst.FileModeFlags), set(( FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR, - FILE_MODE_XOTH, FILE_MODE_XGRP, FILE_MODE_XUSR])) + FILE_MODE_XOTH, FILE_MODE_XGRP, FILE_MODE_XUSR,))) objpath.wrapped_object["Name"] = permsdir + 'r---w---x' inst = objpath.to_instance() self.assertEqual(inst.FileMode, stat.S_IFREG | 0421) self.assertEqual(set(inst.FileModeFlags), set(( - FILE_MODE_RUSR, FILE_MODE_WGRP, FILE_MODE_XOTH])) + FILE_MODE_RUSR, FILE_MODE_WGRP, FILE_MODE_XOTH,))) objpath.wrapped_object["Name"] = permsdir + 'rwSr--r--' inst = objpath.to_instance() self.assertEqual(inst.FileMode, stat.S_IFREG | 04644) self.assertEqual(set(inst.FileModeFlags), set(( FILE_MODE_RUSR, FILE_MODE_WUSR, - FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SUID])) + FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SUID,))) objpath.wrapped_object["Name"] = permsdir + 'rw-r-Sr--' inst = objpath.to_instance() self.assertEqual(inst.FileMode, stat.S_IFREG | 02644) self.assertEqual(set(inst.FileModeFlags), set(( FILE_MODE_RUSR, FILE_MODE_WUSR, - FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SGID))) + FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SGID,))) objpath.wrapped_object["Name"] = permsdir + 'rw-r--r-T' inst = objpath.to_instance() self.assertEqual(inst.FileMode, stat.S_IFREG | 01644) self.assertEqual(set(inst.FileModeFlags), set(( FILE_MODE_RUSR, FILE_MODE_WUSR, - FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SVTX))) + FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SVTX,))) objpath.wrapped_object["Name"] = permsdir + 'rwsr-sr-t' inst = objpath.to_instance() @@ -613,7 +613,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): self.assertEqual(set(inst.FileModeFlags), set(( FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR, FILE_MODE_XOTH, FILE_MODE_XGRP, FILE_MODE_XUSR, - FILE_MODE_WUSR, FILE_MODE_SUID, FILE_MODE_SGID, FILE_MODE_SVTX))) + FILE_MODE_WUSR, FILE_MODE_SUID, FILE_MODE_SGID, FILE_MODE_SVTX,))) @enable_lmi_exceptions def test_enum_instance_names(self): @@ -653,7 +653,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE,))) # restore it shutil.copy(backup, fp) @@ -673,7 +673,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() self.assertEqual(set(inst.FailedFlags), - set((FAILED_FLAGS_SIZE, FAILED_FLAGS_CHECKSUM))) + set((FAILED_FLAGS_SIZE, FAILED_FLAGS_CHECKSUM,))) # restore it shutil.copy(backup, fp) @@ -690,7 +690,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MTIME))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MTIME,))) @enable_lmi_exceptions @swbase.test_with_packages('stable#pkg1') @@ -742,7 +742,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_UID))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_UID,))) # remove symlink os.remove(fp) @@ -751,7 +751,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_EXISTENCE))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_EXISTENCE,))) # restore it (mtime) os.symlink("../data/target.txt", fp) @@ -769,7 +769,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_TARGET))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_TARGET,))) @swbase.test_with_packages('stable#pkg3') def test_method_invoke_on_fifo(self): @@ -804,7 +804,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_UID))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_UID,))) # remove fifo os.remove(fp) @@ -813,7 +813,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_EXISTENCE))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_EXISTENCE,))) # restore it os.mkfifo(fp, 0644) @@ -832,7 +832,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE,))) # replace it with regular file os.remove(fp) @@ -847,7 +847,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() self.assertEqual(inst.FileType, FILE_TYPE_FILE) - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE,))) @swbase.test_with_packages('stable#pkg4') def test_method_invoke_on_directory(self): @@ -890,7 +890,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase): (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname) self.assertEqual(rval, INVOKE_NOT_SATISFIED) inst.refresh() - self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE))) + self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE,))) def suite(): """For unittest loaders.""" |