Merge lp:~noskcaj/ubuntu/vivid/fedmsg-meta-fedora-infrastructure/disable-tests into lp:ubuntu/vivid/fedmsg-meta-fedora-infrastructure

[Jackson Doak]

Disable tests because they need web access. (So offline tests still run)
Is this change ok?

[Didier Roche-Tolomelli (didrocks)]

The change looks good to me as there is no other alternatives (or maybe marked all tests as skipped, but it seems they all need network connection).

Do you mind just noting in debian/rules on top of the override_dh_auto_test the reason? (it's easier than diving into the changelog)

Then, just ping me and I'll sponsor, thanks!

review: Needs Information

[lp:~noskcaj/ubuntu/vivid/fedmsg-meta-fedora-infrastructure/disable-tests]

6. By Jackson Doak on 2015-04-03

Add comment to d/rules

Unmerged revisions

6. By Jackson Doak on 2015-04-03

Add comment to d/rules

5. By Jackson Doak on 2015-02-27

Disable tests because they need an internet connection

4. By Nicolas Dandrimont <email address hidden> on 2014-08-16

New upstream release

=== modified file 'PKG-INFO'
--- PKG-INFO	2014-07-14 22:20:38 +0000
+++ PKG-INFO	2015-04-03 19:43:46 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: fedmsg_meta_fedora_infrastructure
-Version: 0.2.15
+Version: 0.2.18
 Summary: fedmsg metadata providers for Fedora Infrastructure's deployment
 Home-page: https://github.com/ralphbean/fedmsg_meta_fedora_infrastructure/
 Author: Ralph Bean

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-14 22:20:38 +0000
+++ debian/changelog	2015-04-03 19:43:46 +0000
@@ -1,3 +1,15 @@
+fedmsg-meta-fedora-infrastructure (0.2.18-1ubuntu1) vivid; urgency=medium
+
+  * Disable tests because they need an internet connection
+
+ -- Jackson Doak <[e-mail]>  Sat, 28 Feb 2015 06:38:22 +1100
+
+fedmsg-meta-fedora-infrastructure (0.2.18-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Nicolas Dandrimont <[e-mail]>  Sat, 16 Aug 2014 00:57:05 +0200
+
 fedmsg-meta-fedora-infrastructure (0.2.15-1) unstable; urgency=medium
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2014-05-18 18:33:16 +0000
+++ debian/control	2015-04-03 19:43:46 +0000
@@ -1,7 +1,8 @@
 Source: fedmsg-meta-fedora-infrastructure
 Section: python
 Priority: optional
-Maintainer: Nicolas Dandrimont <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Nicolas Dandrimont <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-python,
                python-all,

=== modified file 'debian/rules'
--- debian/rules	2014-05-18 18:33:16 +0000
+++ debian/rules	2015-04-03 19:43:46 +0000
@@ -1,3 +1,7 @@
 #!/usr/bin/make -f
+
 %:
 	dh $@ --with python2 --buildsystem=pybuild
+
+# Disable tests because they need an internet connection
+dh_auto_test:

=== modified file 'fedmsg_meta_fedora_infrastructure.egg-info/PKG-INFO'
--- fedmsg_meta_fedora_infrastructure.egg-info/PKG-INFO	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure.egg-info/PKG-INFO	2015-04-03 19:43:46 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: fedmsg-meta-fedora-infrastructure
-Version: 0.2.15
+Version: 0.2.18
 Summary: fedmsg metadata providers for Fedora Infrastructure's deployment
 Home-page: https://github.com/ralphbean/fedmsg_meta_fedora_infrastructure/
 Author: Ralph Bean

=== modified file 'fedmsg_meta_fedora_infrastructure.egg-info/SOURCES.txt'
--- fedmsg_meta_fedora_infrastructure.egg-info/SOURCES.txt	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure.egg-info/SOURCES.txt	2015-04-03 19:43:46 +0000
@@ -23,6 +23,7 @@
 fedmsg_meta_fedora_infrastructure/fasshim.py
 fedmsg_meta_fedora_infrastructure/fedimg.py
 fedmsg_meta_fedora_infrastructure/fedocal.py
+fedmsg_meta_fedora_infrastructure/fedoracollege.py
 fedmsg_meta_fedora_infrastructure/fmn.py
 fedmsg_meta_fedora_infrastructure/github.py
 fedmsg_meta_fedora_infrastructure/jenkins.py
@@ -59,6 +60,7 @@
 fedmsg_meta_fedora_infrastructure/tests/elections.py
 fedmsg_meta_fedora_infrastructure/tests/fedimg.py
 fedmsg_meta_fedora_infrastructure/tests/fedocal.py
+fedmsg_meta_fedora_infrastructure/tests/fedoracollege.py
 fedmsg_meta_fedora_infrastructure/tests/fmn.py
 fedmsg_meta_fedora_infrastructure/tests/ftpsync.py
 fedmsg_meta_fedora_infrastructure/tests/github.py

=== modified file 'fedmsg_meta_fedora_infrastructure/coprs.py'
--- fedmsg_meta_fedora_infrastructure/coprs.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/coprs.py	2015-04-03 19:43:46 +0000
@@ -48,7 +48,7 @@
             tmpl = self._("{user} started a new build of the {copr} copr")
         elif 'copr.build.end' in msg['topic']:
             tmpl = self._(
-                "{user}'s {copr} copr build finished with '{status}'")
+                "{user}'s {copr} copr build finished {chroot} with '{status}'")
         elif 'copr.chroot.start' in msg['topic']:
             tmpl = self._("{user}'s {copr} copr started a new {chroot} chroot")
         elif 'copr.worker.create' in msg['topic']:

=== modified file 'fedmsg_meta_fedora_infrastructure/fedimg.py'
--- fedmsg_meta_fedora_infrastructure/fedimg.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/fedimg.py	2015-04-03 19:43:46 +0000
@@ -30,18 +30,35 @@
     __obj__ = "New cloud image upload"
 
     def subtitle(self, msg, **config):
-        if msg['msg']['status'] is "started":
-            name = msg['msg']['image_name']
-            dest = msg['msg']['destination']
-            tmpl = self._('Image {image_name} started uploading to {dest}')
-            return tmpl.format(image_name=name, dest=dest)
-        elif msg['msg']['status'] is "completed":
-            name = msg['msg']['image_name']
-            dest = msg['msg']['destination']
-            tmpl = self._('Image {image_name} finished uploading to to {dest}')
-            return tmpl.format(image_name=name, dest=dest)
-        elif msg['msg']['status'] is "failed":
-            name = msg['msg']['image_name']
-            dest = msg['msg']['destination']
-            tmpl = self._('Image {image_name} failed to upload to {dest}')
-            return tmpl.format(image_name=name, dest=dest)
+        if 'image.upload' in msg['topic']:
+            if msg['msg']['status'] is "started":
+                name = msg['msg']['image_name']
+                dest = msg['msg']['destination']
+                tmpl = self._('Image {image_name} started uploading to {dest}')
+                return tmpl.format(image_name=name, dest=dest)
+            elif msg['msg']['status'] is "completed":
+                name = msg['msg']['image_name']
+                dest = msg['msg']['destination']
+                tmpl = self._('Image {image_name} finished uploading to to {dest}')
+                return tmpl.format(image_name=name, dest=dest)
+            elif msg['msg']['status'] is "failed":
+                name = msg['msg']['image_name']
+                dest = msg['msg']['destination']
+                tmpl = self._('Image {image_name} failed to upload to {dest}')
+                return tmpl.format(image_name=name, dest=dest)
+        if 'image.test' in msg['topic']:
+            if msg['msg']['status'] is "started":
+                name = msg['msg']['image_name']
+                dest = msg['msg']['destination']
+                tmpl = self._('Image {image_name} started testing on {dest}')
+                return tmpl.format(image_name=name, dest=dest)
+            elif msg['msg']['status'] is "completed":
+                name = msg['msg']['image_name']
+                dest = msg['msg']['destination']
+                tmpl = self._('Image {image_name} finished testing on {dest}')
+                return tmpl.format(image_name=name, dest=dest)
+            elif msg['msg']['status'] is "failed":
+                name = msg['msg']['image_name']
+                dest = msg['msg']['destination']
+                tmpl = self._('Image {image_name} failed testing on {dest}')
+                return tmpl.format(image_name=name, dest=dest)

=== added file 'fedmsg_meta_fedora_infrastructure/fedoracollege.py'
--- fedmsg_meta_fedora_infrastructure/fedoracollege.py	1970-01-01 00:00:00 +0000
+++ fedmsg_meta_fedora_infrastructure/fedoracollege.py	2015-04-03 19:43:46 +0000
@@ -0,0 +1,77 @@
+# This file is part of fedmsg.
+# Copyright (C) 2014 Red Hat, Inc.
+#
+# fedmsg is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# fedmsg is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with fedmsg; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+#
+# Authors:  Hammad Haleem <[e-mail]>
+'''Preprocessor for fedora college'''
+
+from fedmsg_meta_fedora_infrastructure import BaseProcessor
+from .fasshim import gravatar_url
+
+
+class FedoraCollegeProcessor(BaseProcessor):
+    __name__ = "FedoraCollege"
+    __description__ = "The virtual Classroom for new fedora contributors"
+    __obj__ = "Delivering video tutorials"
+
+    '''
+    currently not in production
+    __link__ = "https://ask.fedoraproject.org"
+    __docs__ = "https://askbot.com"
+    __icon__ = "https://apps.fedoraproject.org/img/icons/ask_fedora.png"
+    '''
+
+    def subtitle(self, msg, **config):
+
+        username = msg['msg']['username']
+        title = msg['msg']['title']
+
+        if "fedoracollege.media.upload" in msg['topic']:
+            tmpl = self._(
+                '{username} uploaded a new file of type "{title}"')
+        elif "fedoracollege.content.added" in msg['topic']:
+            tmpl = self._(
+                '{username} Created new content titled "{title}"')
+        elif "fedoracollege.content.edit" in msg['topic']:
+            tmpl = self._(
+                '{username} Edited content titled "{title}"')
+        else:
+            raise NotImplementedError("%r" % msg)
+
+        return tmpl.format(username=username, title=title)
+
+    def secondary_icon(self, msg, **config):
+        user = None
+
+        try:
+            user = msg['msg']['username']
+        except KeyError:
+            pass
+
+        if not user:
+            return ""
+
+        return gravatar_url(username=user)
+
+    def usernames(self, msg, **config):
+        if 'username' in msg['msg']:
+            return set([msg['msg']['username']])
+
+        return set()
+
+    def link(self, msg, **config):
+        return msg['msg']['link']

=== modified file 'fedmsg_meta_fedora_infrastructure/github.py'
--- fedmsg_meta_fedora_infrastructure/github.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/github.py	2015-04-03 19:43:46 +0000
@@ -31,7 +31,9 @@
 
     def _get_user(self, msg):
         if msg['msg'].get('commit', None):
-            user = msg['msg']['commit'].get('author', {}).get('login', {})
+            user = msg['msg']['commit'].get('author')
+            if user:
+                user = user.get('login')
             if user:
                 return msg['msg']['fas_usernames'].get(user, user)
         if msg['msg'].get('pusher', None):
@@ -57,6 +59,8 @@
             return None
 
     def link(self, msg, **config):
+        if 'github.watch' in msg['topic']:
+            return msg['msg']['repository']['html_url'] + "/watchers"
         if 'target_url' in msg['msg']:
             return msg['msg']['target_url']
         if 'compare' in msg['msg']:
@@ -124,6 +128,10 @@
             sha = msg['msg']['sha'][:8]
             tmpl = self._("{description} for {repo} {sha}")
             return tmpl.format(description=description, repo=repo, sha=sha)
+        elif 'github.watch' in msg['topic']:
+            tmpl = self._('{user} {action} watching {repo}')
+            action = msg['msg']['action']
+            return tmpl.format(user=user, repo=repo, action=action)
         else:
             pass
 
@@ -148,6 +156,7 @@
             'github.commit_comment': 'tree',
             'github.create': None,
             'github.delete': None,
+            'github.watch': None,
         }
 
         if suffix not in lookup:
@@ -180,5 +189,7 @@
             items = [msg['msg']['commit']['sha']]
         elif suffix == 'github.commit_comment':
             items = [msg['msg']['comment']['path']]
+        elif suffix == 'github.watch':
+            items = ['watchers']
 
         return set([base + '/' + item for item in items])

=== modified file 'fedmsg_meta_fedora_infrastructure/jenkins.py'
--- fedmsg_meta_fedora_infrastructure/jenkins.py	2014-05-18 18:33:16 +0000
+++ fedmsg_meta_fedora_infrastructure/jenkins.py	2015-04-03 19:43:46 +0000
@@ -37,6 +37,12 @@
             tmpl = self._("Jenkins project '{project}' failed to build")
         elif 'jenkins.build.passed' in msg['topic']:
             tmpl = self._("Jenkins project '{project}' built successfully")
+        elif 'jenkins.build.unstable' in msg['topic']:
+            tmpl = self._("Jenkins project '{project}' built with warnings")
+        elif 'jenkins.build.notbuilt' in msg['topic']:
+            tmpl = self._("Jenkins project '{project}' did not build")
+        elif 'jenkins.build.aborted' in msg['topic']:
+            tmpl = self._("Jenkins project '{project}' build aborted")
         elif 'jenkins.build.start' in msg['topic']:
             tmpl = self._("Jenkins project '{project}' started building")
         else:

=== modified file 'fedmsg_meta_fedora_infrastructure/pkgdb.py'
--- fedmsg_meta_fedora_infrastructure/pkgdb.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/pkgdb.py	2015-04-03 19:43:46 +0000
@@ -62,7 +62,7 @@
             master = msg['msg']['master']
             return tmpl.format(agent=agent, package=package,
                                branch=branch, master=master)
-        elif 'pkgdb.package.update' in msg['topic']:
+        elif 'pkgdb.package.update.status' in msg['topic']:
             tmpl = self._(u"{agent} {verb} {package}{extra}")
             extra = ""
 
@@ -90,6 +90,25 @@
 
             return tmpl.format(agent=agent, package=package, verb=verb,
                                extra=extra)
+        elif msg['topic'].endswith('pkgdb.package.update'):
+            agent = get_agent(msg)
+
+            try:
+                package = msg['msg']['package_listing']['package']['name']
+            except KeyError:
+                package = msg['msg']['package']
+            if isinstance(package, dict):
+                package = package['name']
+
+            if 'fields' in msg['msg']:
+                # New pkgdb2 style
+                tmpl = self._(u"{agent} updated: {fields} of {package}")
+                fields = ', '.join(msg['msg'].get('fields'))
+                return tmpl.format(agent=agent, package=package, fields=fields)
+            else:
+                # old old pkgdb1 style
+                tmpl = self._(u"{agent} made some updates to {package}")
+                return tmpl.format(agent=agent, package=package)
         elif 'pkgdb.critpath.update' in msg['topic']:
             tmpl = self._(
                 u"{agent} altered the critpath status for some packages")
@@ -296,6 +315,8 @@
                 package = _msg['package_listing']['package']['name']
             except KeyError:
                 package = _msg['package']
+            if isinstance(package, dict):
+                package = package['name']
             objs.add('{package}/update'.format(package=package))
         elif 'pkgdb.branch.clone' in msg['topic']:
             objs.add('{package}/branch'.format(package=_msg['package']))
@@ -319,6 +340,8 @@
         try:
             if isinstance(msg['msg']['package'], basestring):
                 packages.add(msg['msg']['package'])
+            else:
+                packages.add(msg['msg']['package']['name'])
         except KeyError:
             pass
 
@@ -353,6 +376,8 @@
                 package = msg['msg']['package_listing']['package']['name']
             except KeyError:
                 package = msg['msg']['package']
+            if isinstance(package, dict):
+                package = package['name']
             return tmpl.format(package=package)
 
         return ""

=== modified file 'fedmsg_meta_fedora_infrastructure/tests/coprs.py'
--- fedmsg_meta_fedora_infrastructure/tests/coprs.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/tests/coprs.py	2015-04-03 19:43:46 +0000
@@ -68,7 +68,8 @@
     when a build has completed.
     """
     expected_title = "copr.build.end"
-    expected_subti = ("fatka's mutt-kz copr build finished with 'success'")
+    expected_subti = (
+        "fatka's mutt-kz copr build finished fedora-20-x86_64 with 'success'")
     expected_secondary_icon = (
         'https://seccdn.libravatar.org/avatar/'
         'b9d974c03597da48d9c3b11d4423bf30c6e0c01c23bcd3a192167a95f7c506bc?'
@@ -88,6 +89,7 @@
         u'topic': u'org.fedoraproject.prod.copr.build.end',
         u'msg': {
             u'status': 1,
+            u'chroot': u'fedora-20-x86_64',
             u'what': u'build end: user:fatka copr:mutt-kz build:100 '
             'ip:172.16.3.3  pid:12010 status:1',
             u'ip': u'172.16.3.3',

=== modified file 'fedmsg_meta_fedora_infrastructure/tests/fedimg.py'
--- fedmsg_meta_fedora_infrastructure/tests/fedimg.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/tests/fedimg.py	2015-04-03 19:43:46 +0000
@@ -56,6 +56,37 @@
         u'timestamp': 1371498303.125771,
     }
 
+
+class TestImageTest(Base):
+    """ These messages are awarded when an image starts has started,
+    completes, or fails. """
+
+    expected_title = "fedimg.image.test"
+    image_name = "fedora-cloud-base-rawhide-20140604.x86_64"
+    dest = "EC2-eu-west-1"
+    expected_subti = "Image {0} started testing on {1}".format(image_name,
+                                                                 dest)
+    expected_link = None
+    expected_icon = None
+    expected_secondary_icon = None
+    expected_packages = set([])
+    expected_usernames = set([])
+    expected_objects = set([])
+    msg = {
+        u'i': 1,
+        u'msg': {
+            u'image_url': 'https://kojipkgs.fedoraproject.org//work/'
+                          'tasks/5144/6925144/fedora-cloud-base-'
+                          'rawhide-20140604.x86_64.raw.xz',
+            u'image_name': 'fedora-cloud-base-rawhide-20140604.x86_64',
+            u'destination': 'EC2-eu-west-1',
+            u'status': 'started',
+        },
+        u'topic': u'org.fedoraproject.stg.fedimg.image.test',
+        u'username': u'fedimg',
+        u'timestamp': 1371498303.125771,
+    }
+
 add_doc(locals())
 
 if __name__ == '__main__':

=== added file 'fedmsg_meta_fedora_infrastructure/tests/fedoracollege.py'
--- fedmsg_meta_fedora_infrastructure/tests/fedoracollege.py	1970-01-01 00:00:00 +0000
+++ fedmsg_meta_fedora_infrastructure/tests/fedoracollege.py	2015-04-03 19:43:46 +0000
@@ -0,0 +1,167 @@
+# This file is part of fedmsg.
+# Copyright (C) 2014 Red Hat, Inc.
+#
+# fedmsg is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# fedmsg is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with fedmsg; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+#
+#
+# Authors:  Hammad Haleem <[e-mail]>
+
+""" Tests for Fedora College Message """
+
+import unittest
+import datetime
+
+from fedmsg.tests.test_meta import Base
+
+from common import add_doc
+
+
+class TestMediaUploadBase():
+
+    """ These messages are for people when
+    they upload stuff to fedora College portal`_.
+    """
+
+    expected_title = "fedoracollege.media.upload"
+    expected_subtitle = 'pingou uploaded a new file of type "image"'
+    expected_link = "http://testlink"
+    expected_icon = (None)
+    expected_secondary_icon = (
+        "https://seccdn.libravatar.org/avatar/"
+        "01fe73d687f4db328da1183f2a1b5b22962ca9d9c50f0728aafeac974856311c"
+        "?s=64&d=retro")
+    expected_packages = set([])
+    expected_usernames = set(['pingou'])
+    msg = {
+        "username": "pingou",
+        "i": 1,
+        "timestamp": 1379638157.759283,
+        "msg_id": "2013-96f9ca0e-c7c6-43f0-9de7-7a268c7f1cef",
+        "topic": "fedoracollege.media.upload",
+        "link": "https://FedoraCollege.org/testlink",
+        "msg":
+        {
+                    "title": "image",
+                    "link": "https://testlink",
+                    "content_url": "http://demo.engineerinme.com/static/uploads/\
+                    hammadhaleem/1404190396.4603c7aec5\
+                    a7f21a64a4489fc68d762168.png",
+                    "file_type": "image",
+                    "filename": "1404190396.4603c7aec5a7f\
+                    21a64a4489fc68d762168.png",
+                    "id": "1",
+                    "name": "File upload",
+                    "sys_path ": "/home/engineer/fedora-college/fedora_college/static/\
+                    uploads/hammadhaleem/34343423.png",
+                    "tags": "fedora-college  image-upload website ",
+                    "thumb": "static/uploads/hammadhaleem/1404190396.4603c7aec5a7f21a64a4489f\
+                    c68d762168.png_thumb.jpg",
+                    "timestamp": "2014-07-01 04:53:16.599954",
+                    "username": "pingou"
+        }
+    }
+
+
+class TestContentEdit(Base):
+
+    """ These messages are published when
+    someone edit content in the fedora College.
+    """
+    expected_title = "fedoracollege.content.edit"
+    expected_subtitle = 'pingou Edited content titled "test"'
+    expected_link = "http://testlink"
+    expected_icon = (None)
+    expected_secondary_icon = (
+        "https://seccdn.libravatar.org/avatar/"
+        "01fe73d687f4db328da1183f2a1b5b22962ca9d9c50f0728aafeac974856311c"
+        "?s=64&d=retro")
+    expected_packages = set([])
+    expected_usernames = set(['pingou'])
+    msg = {
+        "username": "pingou",
+        "i": 1,
+        "timestamp": 1379638157.759283,
+        "msg_id": "2013-96f9ca0e-c7c6-43f0-9de7-7a268c7f1cef",
+        "topic": "fedoracollege.content.edit",
+        "link": "https://FedoraCollege.org/testlink",
+        "msg":
+        {
+                    "title": "test",
+                    "link": "https://testlink",
+                    "active": True,
+                    "date_added": "Tue, 01 Jul 2014 19:07:00 GMT",
+                    "description": "The Content available on this\
+                    website is contributed from people in fedora\
+                    community. Mostly all\
+                    the content has CC licence.</p>",
+                    "id": 2,
+                    "media_added_ids": "",
+                    "slug": "about-the-content",
+                    "tags": "fedora-college, blog",
+                    "title": "About the content",
+                    "type": "blog",
+                    "username": "pingou"
+        }
+    }
+
+
+class TestContentAdded(Base):
+
+    """ These messages are published when
+    someone edit content in the fedora College.
+    """
+
+    expected_title = "fedoracollege.content.edit"
+    expected_subtitle = 'pingou Created new content titled "test"'
+    expected_link = "http://testlink"
+    expected_icon = (None)
+    expected_secondary_icon = (
+        "https://seccdn.libravatar.org/avatar/"
+        "01fe73d687f4db328da1183f2a1b5b22962ca9d9c50f0728aafeac974856311c"
+        "?s=64&d=retro")
+    expected_packages = set([])
+    expected_usernames = set(['pingou'])
+    msg = {
+        "username": "pingou",
+        "i": 1,
+        "timestamp": 1379638157.759283,
+        "msg_id": "2013-96f9ca0e-c7c6-43f0-9de7-7a268c7f1cef",
+        "topic": "fedoracollege.content.added",
+        "link": "https://FedoraCollege.org/testlink",
+        "msg": {
+            "title": "test",
+            "link": "https://testlink",
+            "active": True,
+                    "date_added": "Tue, 01 Jul 2014 19:07:00 GMT",
+                    "description": "The Content available on this\
+                    website is contributed from people in fedora\
+                    community. Mostly all\
+                    the content has CC licence.</p>",
+                    "id": 2,
+                    "media_added_ids": "",
+                    "slug": "about-the-content",
+                    "tags": "fedora-college, blog",
+                    "title": "About the content",
+                    "type": "blog",
+                    "username": "pingou"
+        }
+    }
+
+
+add_doc(locals())
+
+if __name__ == '__main__':
+    unittest.main()

=== modified file 'fedmsg_meta_fedora_infrastructure/tests/github.py'
--- fedmsg_meta_fedora_infrastructure/tests/github.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/tests/github.py	2015-04-03 19:43:46 +0000
@@ -1483,6 +1483,88 @@
     }
 
 
+class TestGithubWatch(Base):
+    """ There exists `a service
+    <https://apps.fedoraproject.org/github2fedmsg>`_ to link the select github
+    repos of fedora contributors with the fedmsg bus.
+
+    Messages of *this* type are published whenever someone **watches a
+    repository**.
+    """
+
+    expected_title = "github.watch"
+    expected_subti = "alikins started watching fedora-infra/summershum"
+    expected_link = "https://github.com/fedora-infra/summershum/watchers"
+    expected_icon = "https://apps.fedoraproject.org/img/icons/github.png"
+    expected_secondary_icon = (
+        "https://seccdn.libravatar.org/avatar/"
+        "d23ffcf6c375ae6351f54b6d4e381c6910e68d666370e5ff21e4322cd56690bf"
+        "?s=64&d=retro")
+    expected_packages = set([])
+    expected_usernames = set([])
+    expected_objects = set([
+        'fedora-infra/summershum/watchers',
+    ])
+    msg = {
+        "source_name": "datanommer",
+        "i": 1,
+        "timestamp": 1403363334.0,
+        "msg_id": "2014-5273bf43-d483-48d4-a8d6-11c988cae0cb",
+        "topic": "org.fedoraproject.prod.github.watch",
+        "source_version": "0.6.4",
+        "msg": {
+            "action": "started",
+            "fas_usernames": {},
+            "repository": {
+                "has_wiki": False,
+                "forks_count": 7,
+                "updated_at": "2014-06-21T15:08:53Z",
+                "private": False,
+                "full_name": "fedora-infra/summershum",
+                "owner": {
+                    "url": "https://api.github.com/users/fedora-infra",
+                    "site_admin": False,
+                    "html_url": "https://github.com/fedora-infra",
+                    "gravatar_id": "ebdef1eaaa4b1c1cb01f5570efbb3cc4",
+                    "login": "fedora-infra",
+                    "type": "Organization",
+                    "id": 3316637
+                },
+                "id": 16620564,
+                "size": 907,
+                "watchers_count": 10,
+                "forks": 7,
+                "homepage": "",
+                "fork": False,
+                "description": "fedmsg consumer that extracts hashes of "
+                "source files",
+                "has_downloads": True,
+                "default_branch": "develop",
+                "html_url": "https://github.com/fedora-infra/summershum",
+                "has_issues": True,
+                "stargazers_count": 10,
+                "open_issues_count": 2,
+                "watchers": 10,
+                "name": "summershum",
+                "language": "Python",
+                "url": "https://api.github.com/repos/fedora-infra/summershum",
+                "created_at": "2014-02-07T16:35:59Z",
+                "pushed_at": "2014-06-13T12:11:18Z",
+                "open_issues": 2
+            },
+            "sender": {
+                "url": "https://api.github.com/users/alikins",
+                "site_admin": False,
+                "html_url": "https://github.com/alikins",
+                "gravatar_id": "81877b32b5fac41db3207c94ecc26173",
+                "login": "alikins",
+                "type": "User",
+                "id": 15162
+            }
+        }
+    }
+
+
 add_doc(locals())
 
 if __name__ == '__main__':

=== modified file 'fedmsg_meta_fedora_infrastructure/tests/jenkins.py'
--- fedmsg_meta_fedora_infrastructure/tests/jenkins.py	2014-05-18 18:33:16 +0000
+++ fedmsg_meta_fedora_infrastructure/tests/jenkins.py	2015-04-03 19:43:46 +0000
@@ -105,6 +105,84 @@
         },
     }
 
+class TestJenkinsBuildAborted(Base):
+    """ `Jenkins <http://jenkins.cloud.fedoraproject.org/>`_ publishes these
+    messages when a build is aborted.
+    """
+    expected_title = "jenkins.build.aborted"
+    expected_subti = ("Jenkins project 'fedora-mobile' build aborted")
+    expected_secondary_icon = ''
+    expected_packages = set([])
+    expected_usernames = set([])
+    expected_objects = set([
+        'jenkins/fedora-mobile/build.aborted',
+    ])
+    expected_link = (
+        "http://jenkins.cloud.fedoraproject.org/job/fedora-mobile/165/")
+    msg = {
+        u'i': 1,
+        u'timestamp': 1390982532.0,
+        u'msg_id': u'2014-851eb465-56f2-4f3f-bf8a-2b86c95d1246',
+        u'topic': u'org.fedoraproject.prod.jenkins.build.aborted',
+        u'msg': {
+            u'project': 'fedora-mobile',
+            u'took': u'9.4 sec',
+            u'build': 165,
+        },
+    }
+
+class TestJenkinsBuildNotBuilt(Base):
+    """ `Jenkins <http://jenkins.cloud.fedoraproject.org/>`_ publishes these
+    messages when a build doesn't actually build (wat?).
+    """
+    expected_title = "jenkins.build.notbuilt"
+    expected_subti = ("Jenkins project 'fedora-mobile' did not build")
+    expected_secondary_icon = ''
+    expected_packages = set([])
+    expected_usernames = set([])
+    expected_objects = set([
+        'jenkins/fedora-mobile/build.notbuilt',
+    ])
+    expected_link = (
+        "http://jenkins.cloud.fedoraproject.org/job/fedora-mobile/165/")
+    msg = {
+        u'i': 1,
+        u'timestamp': 1390982532.0,
+        u'msg_id': u'2014-851eb465-56f2-4f3f-bf8a-2b86c95d1246',
+        u'topic': u'org.fedoraproject.prod.jenkins.build.notbuilt',
+        u'msg': {
+            u'project': 'fedora-mobile',
+            u'took': u'9.4 sec',
+            u'build': 165,
+        },
+    }
+
+class TestJenkinsBuildUnstable(Base):
+    """ `Jenkins <http://jenkins.cloud.fedoraproject.org/>`_ publishes these
+    messages when a build completes with warnings.
+    """
+    expected_title = "jenkins.build.unstable"
+    expected_subti = ("Jenkins project 'fedora-mobile' built with warnings")
+    expected_secondary_icon = ''
+    expected_packages = set([])
+    expected_usernames = set([])
+    expected_objects = set([
+        'jenkins/fedora-mobile/build.unstable',
+    ])
+    expected_link = (
+        "http://jenkins.cloud.fedoraproject.org/job/fedora-mobile/165/")
+    msg = {
+        u'i': 1,
+        u'timestamp': 1390982532.0,
+        u'msg_id': u'2014-851eb465-56f2-4f3f-bf8a-2b86c95d1246',
+        u'topic': u'org.fedoraproject.prod.jenkins.build.unstable',
+        u'msg': {
+            u'project': 'fedora-mobile',
+            u'took': u'9.4 sec',
+            u'build': 165,
+        },
+    }
+
 
 add_doc(locals())
 

=== modified file 'fedmsg_meta_fedora_infrastructure/tests/pkgdb.py'
--- fedmsg_meta_fedora_infrastructure/tests/pkgdb.py	2014-07-14 22:20:38 +0000
+++ fedmsg_meta_fedora_infrastructure/tests/pkgdb.py	2015-04-03 19:43:46 +0000
@@ -250,9 +250,9 @@
     }
 
 
-class TestPkgdbPackageUpdate(Base):
+class TestPkgdbPackageUpdateStatus(Base):
     """ The Fedora `Package DB <https://admin.fedoraproject.org/pkgdb>`_
-    publishes this message when metadata for a package is updated.
+    publishes this message when the status of a package is updated.
     """
     expected_title = "pkgdb.package.update.status"
     expected_subti = "ralph unretired guake in F-18"
@@ -297,6 +297,42 @@
         }
     }
 
+class TestPkgdbPackageUpdate(Base):
+    """ The Fedora `Package DB <https://admin.fedoraproject.org/pkgdb>`_
+    publishes this message when metadata for a package is updated.
+    """
+    expected_title = "pkgdb.package.update"
+    expected_subti = "pkgdb_updater updated: summary, description of guake"
+    expected_link = "https://admin.fedoraproject.org/pkgdb/package/guake/"
+    expected_icon = ("https://apps.fedoraproject.org/packages/images/icons/"
+                     "package_128x128.png")
+    expected_secondary_icon = (
+        "https://seccdn.libravatar.org/avatar/"
+        "1ff483b03adb34142ac55a5efecfa71b0149d57566f86d969905005b0ab98def"
+        "?s=64&d=retro")
+    expected_packages = set(['guake'])
+    expected_usernames = set(['pkgdb_updater'])
+    expected_objects = set(['guake/update'])
+    msg = {
+        "username": "apache",
+        "i": 144,
+        "timestamp": 1379605523.496933,
+        "msg_id": "2013-c131fb95-0a2e-4426-95c3-09766e017d29",
+        "topic": "org.fedoraproject.dev.pkgdb.package.update",
+        "msg": {
+            "package": {
+                    "status": "Approved",
+                    "upstream_url": "http://guake.org",
+                    "name": "guake",
+                    "creation_date": 1379619917.0,
+                    "summary": "Top down terminal for GNOME",
+                    "review_url": "https://bugzilla.redhat.com/450189"
+                },
+            "agent": "pkgdb_updater",
+            "fields": ["summary", "description"],
+        }
+    }
+
 
 class TestPkgdbBranchClone(Base):
     """ The Fedora `Package DB <https://admin.fedoraproject.org/pkgdb>`_
@@ -359,7 +395,7 @@
     }
 
 
-class TestPkgdbPackageRetire(Base):
+class TestLegacyPkgdbPackageRetire(Base):
     """ The Fedora `Package DB <https://admin.fedoraproject.org/pkgdb>`_
     publishes messages on this topic when a package is retired.  For example:
     """

=== modified file 'setup.py'
--- setup.py	2014-07-14 22:20:38 +0000
+++ setup.py	2015-04-03 19:43:46 +0000
@@ -101,7 +101,7 @@
 
 setup(
     name='fedmsg_meta_fedora_infrastructure',
-    version='0.2.15',
+    version='0.2.18',
     description=
     "fedmsg metadata providers for Fedora Infrastructure's deployment",
     long_description=long_description,