diff --git a/src/zypper_plugins/package_upload.py b/src/zypper_plugins/package_upload.py index ed69b7eb8..c508c9969 100755 --- a/src/zypper_plugins/package_upload.py +++ b/src/zypper_plugins/package_upload.py @@ -14,13 +14,13 @@ from os import readlink, getppid, environ from os.path import basename -import sys import logging from katello.packages import upload_package_profile from zypp_plugin import Plugin + class KatelloZyppPlugin(Plugin): def __init__(self): @@ -30,7 +30,6 @@ def __init__(self): self.cleanup = "number" self.userdata = {} - def parse_userdata(self, s): userdata = {} for kv in s.split(","): @@ -41,7 +40,6 @@ def parse_userdata(self, s): userdata[k] = v.strip() return userdata - def get_userdata(self, headers): try: return self.parse_userdata(headers['userdata']) @@ -51,7 +49,6 @@ def get_userdata(self, headers): logging.error("invalid userdata") return {} - def PLUGINBEGIN(self, headers, body): self.description = "zypp(%s)" % basename(readlink("/proc/%d/exe" % getppid())) self.userdata = self.get_userdata(headers) diff --git a/test/test_katello/test_tracer/test_deb.py b/test/test_katello/test_tracer/test_deb.py index c6335d765..147f32b59 100644 --- a/test/test_katello/test_tracer/test_deb.py +++ b/test/test_katello/test_tracer/test_deb.py @@ -4,14 +4,12 @@ has_needrestart, use_flag, use_needrestart, - use_needrestart, AptTracerApp, collect_apps ) import subprocess -import sys -from mock import patch, Mock +from mock import patch class TestNeedrestart(unittest.TestCase):