AcceptCommand only adds one comment

Added tests for AcceptCommand with a new Staging:C fixture.

osclib/accept_command.py

@@ -40,20 +40,23 @@ class AcceptCommand(object):
 
         meta = self.api.get_prj_pseudometa(project)
         requests = []
+        packages = []
         for req in meta['requests']:
             self.api.rm_from_prj(project, request_id=req['id'], msg='ready to accept')
+            requests.append(req['id'])
+            packages.append(req['package'])
             msg = 'Accepting staging review for {0}'.format(req['package'])
             print(msg)
 
-            # Write a comment in the project.
-            user = get_request(self.api.apiurl, str(req['id'])).get_creator()
-            self.comment.add_comment(project_name=project, comment='[at]%s: %s' % (user, msg))
-
-            requests.append(req['id'])
-
         for req in requests:
             change_request_state(self.api.apiurl, str(req), 'accepted', message='Accept to factory')
 
+        # A single comment should be enough to notify everybody, since they are
+        # already mentioned in the comments created by select/unselect
+        pkg_list = ", ".join(packages)
+        cmmt = 'Project "{0}" accepted. The following packages have been submitted to factory: {1}.'.format(project, pkg_list)
+        self.comment.add_comment(project_name=project, comment=cmmt)
+
         # XXX CAUTION - AFAIK the 'accept' command is expected to clean the messages here.
         self.comment.delete_from(project_name=project)
 

tests/accept_tests.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# (C) 2014 tchvatal@suse.cz, openSUSE.org
+# Distribute under GPLv2 or later
+
+import sys
+import unittest
+import httpretty
+import mock
+
+from obs import APIURL
+from obs import OBS
+from osc import oscerr
+from osclib.accept_command import AcceptCommand
+from oscs import StagingAPI
+from osclib.comments import CommentAPI
+
+class TestAccept(unittest.TestCase):
+
+    def setUp(self):
+        """
+        Initialize the configuration
+        """
+        self.obs = OBS()
+        self.api = StagingAPI(APIURL)
+
+    def test_accept_comments(self):
+        c_api = CommentAPI(self.api.apiurl)
+        staging_c = 'openSUSE:Factory:Staging:C'
+        comments = c_api.get_comments(project_name=staging_c)
+
+        # Accept staging C (containing apparmor and mariadb)
+        with mock.patch('oscs.StagingAPI.find_openqa_state', return_value='Nothing'):
+          self.assertEqual(True, AcceptCommand(self.api).perform(staging_c))
+
+        # Comments are cleared up
+        accepted_comments = c_api.get_comments(project_name=staging_c)
+        self.assertNotEqual(len(comments), 0)
+        self.assertEqual(len(accepted_comments), 0)
+
+        # But the comment was written at some point
+        self.assertEqual(len(self.obs.comment_bodies), 1)
+        comment = self.obs.comment_bodies[0]
+        self.assertTrue('The following packages have been submitted to factory' in comment)
+        self.assertTrue('apparmor' in comment)
+        self.assertTrue('mariadb' in comment)

tests/fixtures/build/openSUSE:Factory:Staging:C/_result

@@ -0,0 +1,10 @@
+<resultlist state="c7856c90c70c53fae88aacec964b80c0">
+  <result project="openSUSE:Factory:Staging:C" repository="standard" arch="x86_64" code="published" state="published">
+    <status package="apparmor" code="succeeded" />
+    <status package="mariadb" code="succeeded" />
+  </result>
+  <result project="openSUSE:Factory:Staging:C" repository="standard" arch="i585" code="unpublished" state="unpublished">
+    <status package="apparmor" code="succeeded" />
+    <status package="mariadb" code="succeeded" />
+  </result>
+</resultlist>

tests/fixtures/request/501

@@ -0,0 +1 @@
+template_request.xml

tests/fixtures/request/502

@@ -0,0 +1 @@
+template_request.xml

tests/fixtures/source/home:Admin/apparmor

@@ -0,0 +1 @@
+<directory name="${name}" rev="${rev}" vrev="${vrev}" srcmd5="${srcmd5}"/>

tests/fixtures/source/home:Admin/mariadb

@@ -0,0 +1 @@
+<directory name="${name}" rev="${rev}" vrev="${vrev}" srcmd5="${srcmd5}"/>

tests/fixtures/source/openSUSE:Factory:Staging:C/_meta

@@ -0,0 +1 @@
+../openSUSE:Factory:Staging:A/_meta

tests/fixtures/source/openSUSE:Factory:Staging:C/_project

@@ -0,0 +1 @@
+../openSUSE:Factory:Staging:A/_project

tests/fixtures/source/openSUSE:Factory:Staging:C/apparmor

@@ -0,0 +1 @@
+../linksource.xml

tests/fixtures/source/openSUSE:Factory:Staging:C/mariadb

@@ -0,0 +1 @@
+../linksource.xml

tests/obs.py

@@ -141,6 +141,24 @@ class OBS(object):
                 'by_who': 'openSUSE:Factory:Staging:B',
                 'package': 'wine',
             },
+            '501': {
+                'request': 'review',
+                'review': 'new',
+                'who': 'Admin',
+                'by': 'project',
+                'id': '501',
+                'by_who': 'openSUSE:Factory:Staging:C',
+                'package': 'apparmor',
+            },
+            '502': {
+                'request': 'review',
+                'review': 'new',
+                'who': 'Admin',
+                'by': 'project',
+                'id': '502',
+                'by_who': 'openSUSE:Factory:Staging:C',
+                'package': 'mariadb',
+            },
         }
 
         self.staging_project = {
@@ -159,6 +177,12 @@ class OBS(object):
                 'title': 'wine',
                 'description': 'requests:\n- {id: 333, package: wine}',
             },
+            'C': {
+                'project': 'openSUSE:Factory:Staging:C',
+                'title': 'A project ready to be accepted',
+                'description': ("requests:\n - {id: 501, package: apparmor, author: Admin}\n"
+                                " - {id: 502, package: mariadb, author: Admin}"),
+            },
         }
 
         self.links = {
@@ -167,6 +191,16 @@ class OBS(object):
                 'pkg': 'wine',
                 'devprj': 'home:Admin',
             },
+            'openSUSE:Factory:Staging:C/apparmor': {
+                'prj': 'openSUSE:Factory:Staging:C',
+                'pkg': 'apparmor',
+                'devprj': 'home:Admin',
+            },
+            'openSUSE:Factory:Staging:C/mariadb': {
+                'prj': 'openSUSE:Factory:Staging:C',
+                'pkg': 'mariadb',
+                'devprj': 'home:Admin',
+            },
         }
 
         self.meta = {}
@@ -208,6 +242,30 @@ class OBS(object):
                 'name': 'wine',
                 'srcmd5': 'de7a9f5e3bedb01980465f3be3d236cb',
             },
+            'home:Admin/apparmor': {
+                'rev': '1',
+                'vrev': '1',
+                'name': 'apparmor',
+                'srcmd5': 'de7a9f5e3bedb01980465f3be3d236cb',
+            },
+            'openSUSE:Factory/apparmor': {
+                'rev': '1',
+                'vrev': '1',
+                'name': 'apparmor',
+                'srcmd5': 'de7a9f5e3bedb01980465f3be3d236cb',
+            },
+            'home:Admin/mariadb': {
+                'rev': '1',
+                'vrev': '1',
+                'name': 'mariadb',
+                'srcmd5': 'de7a9f5e3bedb01980465f3be3d236cb',
+            },
+            'openSUSE:Factory/mariadb': {
+                'rev': '1',
+                'vrev': '1',
+                'name': 'mariadb',
+                'srcmd5': 'de7a9f5e3bedb01980465f3be3d236cb',
+            },
         }
 
         self.comments = {
@@ -217,9 +275,20 @@ class OBS(object):
                 }
             ],
             'openSUSE:Factory:Staging:U': [],
-            'openSUSE:Factory:Staging:B': []
+            'openSUSE:Factory:Staging:B': [],
+            'openSUSE:Factory:Staging:C': [
+                {'who': 'Admin', 'when': '2014-06-01 17:56:28 UTC', 'id': '2',
+                  'body': ("The list of requests tracked in openSUSE:Factory:Staging:C has changed:\n\n"
+                           " * Request#501 for package apparmor submitted by Admin\n"
+                           " * Request#502 for package mariadb submitted by Admin\n")
+                }
+            ],
         }
 
+        # To track comments created during test execution, even if they have
+        # been deleted afterward
+        self.comment_bodies = []
+
     #
     #  /request/
     #
@@ -316,7 +385,7 @@ class OBS(object):
     # /source/
     #
 
-    @GET(re.compile(r'/source/openSUSE:Factory:Staging:[A|B]/_project'))
+    @GET(re.compile(r'/source/openSUSE:Factory:Staging:[A|B|C]/_project'))
     def source_staging_project_project(self, request, uri, headers):
         """Return the _project information for a staging project."""
         # Load the proper fixture and adjust mtime according the
@@ -338,7 +407,7 @@ class OBS(object):
 
         return response
 
-    @GET(re.compile(r'/source/openSUSE:Factory:Staging:[A|B|U](/\w+)?/_meta'))
+    @GET(re.compile(r'/source/openSUSE:Factory:Staging:[A|B|C|U](/\w+)?/_meta'))
     def source_staging_project_meta(self, request, uri, headers):
         """Return the _meta information for a staging project."""
         key = re.search(r'openSUSE:Factory:Staging:(\w(?:/\w+)?)/_meta', uri).group(1)
@@ -360,7 +429,7 @@ class OBS(object):
 
         return response
 
-    @PUT(re.compile(r'/source/openSUSE:Factory:Staging:[A|B|U](/\w+)?/_meta'))
+    @PUT(re.compile(r'/source/openSUSE:Factory:Staging:[A|B|C|U](/\w+)?/_meta'))
     def put_source_staging_project_meta(self, request, uri, headers):
         """Set the _meta information for a staging project."""
         key = re.search(r'openSUSE:Factory:Staging:(\w(?:/\w+)?)/_meta', uri).group(1)
@@ -392,13 +461,21 @@ class OBS(object):
 
         return response
 
-    @DELETE('/source/openSUSE:Factory:Staging:B/wine')
+    @DELETE(re.compile('/source/openSUSE:Factory:Staging:[B|C]/\w+'))
-    def delete_wine(self, request, uri, headers):
+    def delete_package(self, request, uri, headers):
-        """Delete the wine source package from B."""
+        """Delete a source package from a Staging project."""
-        del self.links['openSUSE:Factory:Staging:B/wine']
+        package = re.search(r'/source/([\w:]+/\w+)', uri).group(1)
-        response = (200, headers, '<result>Ok</result>')
+        response = (404, headers, '<result>Not found</result>')
+        try:
+            del self.links[package]
+            response = (200, headers, '<result>Ok</result>')
+        except Exception as e:
+            if DEBUG:
+                print uri, e
+
         if DEBUG:
             print 'DELETE', uri, response
+
         return response
 
     @GET(re.compile(r'/source/home:Admin/wine'))
@@ -585,6 +662,7 @@ class OBS(object):
         comment = {'who': 'Admin', 'when': time.strftime('%Y-%m-%d %H:%M:%S UTC', time.gmtime()),
                     'id': str(sum(len(c) for c in self.comments.values()) + 1), 'body': request.body }
         self.comments[prj].append(comment)
+        self.comment_bodies.append(request.body)
         response = (200, headers, '<result>Ok</result>')
         return response