From 8576f228761ea9a89219c65bfb3a4ace083a3c85 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.de>
Date: Sun, 24 Nov 2019 19:21:14 +0100
Subject: [PATCH] Fix test suite for accept

---
 osclib/accept_command.py | 6 ++++--
 osclib/conf.py           | 1 +
 tests/accept_tests.py    | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osclib/accept_command.py b/osclib/accept_command.py
index 3447f252..a0652485 100644
--- a/osclib/accept_command.py
+++ b/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
diff --git a/osclib/conf.py b/osclib/conf.py
index e45f8897..e815a9d0 100644
--- a/osclib/conf.py
+++ b/osclib/conf.py
@@ -156,6 +156,7 @@ DEFAULT = {
         'staging-required-checks-adi': '',
         'installcheck-ignore-duplicated-binaries': '',
         'onlyadi': '',
+        'nocleanup-packages': '',
         'rings': '',
         'rebuild': '',
         'product': '',
diff --git a/tests/accept_tests.py b/tests/accept_tests.py
index 7d799080..1b89f439 100644
--- a/tests/accept_tests.py
+++ b/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))