builds: Fix exception when trying to remove a user which is not a watcher

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 37e9acf6b6b2eccecf0cc00fb25e9725680ecd7b..e3535609d2dc33bdafd6e626712a9f8e0f58642c 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -585,7 +585,10 @@ class Build(base.DataObject):
                )
 
                # Remove from cache
-               self.watchers.remove(user)
+               try:
+                       self.watchers.remove(user)
+               except KeyError:
+                       pass
 
        def _add_watchers(self):
                """

diff --git a/tests/build.py b/tests/build.py
index de159b241967a288a632f2ba814a2700d9bf1500..baf97d65157da218d9eae86bb324013ca726132d 100755 (executable)
--- a/tests/build.py
+++ b/tests/build.py
@@ -60,6 +60,10 @@ class BuildTestCase(test.TestCase):
                with self.db.transaction():
                        build.remove_watcher(self.user)
 
+               # Remove the default user as watcher (again)
+               with self.db.transaction():
+                       build.remove_watcher(self.user)
+
                # Check if the watcher has been removed
                self.assertNotIn(self.user, build.watchers)