Fix test suite for accept

osclib/accept_command.py

@@ -131,9 +131,11 @@ class AcceptCommand(object):
             if self.api.item_exists(self.api.crebuild):
                 self.sync_buildfailures()
 
+        return True
+
     def cleanup(self, project):
         if not self.api.item_exists(project):
-            return False
+            return
 
         pkglist = self.api.list_packages(project)
         clean_list = set(pkglist) - set(self.api.cnocleanup_packages)
@@ -142,7 +144,7 @@ class AcceptCommand(object):
             print("[cleanup] deleted %s/%s" % (project, package))
             delete_package(self.api.apiurl, project, package, force=True, msg="autocleanup")
 
-        return True
+        return
 
     def fix_linking_packages(self, package):
         project = self.api.project

osclib/conf.py

@@ -156,6 +156,7 @@ DEFAULT = {
         'staging-required-checks-adi': '',
         'installcheck-ignore-duplicated-binaries': '',
         'onlyadi': '',
+        'nocleanup-packages': '',
         'rings': '',
         'rebuild': '',
         'product': '',

tests/accept_tests.py

@@ -28,7 +28,7 @@ class TestAccept(unittest.TestCase):
     def test_accept_comments(self):
         wf = self.setup_wf()
 
-        self.assertEqual(True, AcceptCommand(wf.api).perform(self.prj))
+        self.assertEqual(True, AcceptCommand(wf.api).accept_all(['B']))
 
         # Comments are cleared up
         accepted_comments = self.c_api.get_comments(project_name=self.prj)
@@ -40,7 +40,7 @@ class TestAccept(unittest.TestCase):
         # snipe out cleanup to see the comments before the final countdown
         wf.api.staging_deactivate = MagicMock(return_value=True)
 
-        self.assertEqual(True, AcceptCommand(wf.api).perform(self.prj))
+        self.assertEqual(True, AcceptCommand(wf.api).accept_all(['B']))
 
         comments = self.c_api.get_comments(project_name=self.prj)
         self.assertGreater(len(comments), len(self.comments))