Differential D1061

Flexible messaging.
ClosedPublic
Actions

Authored by • ralph2 on Dec 2 2016, 7:32 PM.

Details

Reviewers
tflink
jskladan
Commits
rRSDBfd4ebfb0e838: Flexible messaging.
Summary

This replaces the fedmsg message publication with a plugin-based approach.

Plugins can be specified using setuptools entry-points and must extend an
abstract base class defined in resultsdb.messaging.

The original fedmsg publication code is reimplemented as a new plugin and a new
DummyPlugin is added for use in the test suite. The original test cases all
still pass. Two new test cases are added that use and verify the DummyPlugin.

Test Plan

Run the functional test suite.

Diff Detail

Repository
rRSDB resultsdb
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
• ralph2 retitled this revision from to Flexible messaging..Dec 2 2016, 7:32 PM
• ralph2 updated this object.
• ralph2 edited the test plan for this revision. (Show Details)
• ralph2 added reviewers: tflink, jskladan.
jskladan accepted this revision.Dec 3 2016, 5:04 PM

love it, thanks!

This revision is now accepted and ready to land.Dec 3 2016, 5:04 PM
Closed by commit rRSDBfd4ebfb0e838: Flexible messaging. (authored by Ralph Bean <rbean@redhat.com>). · Explain WhyDec 7 2016, 5:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2710

View Options

.gitignore

1*.pyc 1​*.pyc
2*.pyo 2​*.pyo
3*.swp 3​*.swp
4*__pycache__* 4​*__pycache__*
5.ropeproject/ 5​.ropeproject/
6conf/settings.py 6​conf/settings.py
7*.sqlite 7​*.sqlite
8*.sass-cache 8​*.sass-cache
9*build/ 9​*build/
10*dist/ 10​*dist/
11*.egg* 11​*.egg*
12/env*/ 12​/env*/
13.coverage 13​.coverage
14htmlcov/ 14​htmlcov/
15.cache 15​.cache
16.idea 16​.idea
17​test_env
View Options

conf/settings.py.example

1# Copy this file to `conf/settings.py` to put it into effect. It overrides the values defined 1​# Copy this file to `conf/settings.py` to put it into effect. It overrides the values defined
2# in `resultsdb/config.py`. 2​# in `resultsdb/config.py`.
3SECRET_KEY = 'replace-me-with-something-random' 3​SECRET_KEY = 'replace-me-with-something-random'
4#SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://dbuser:dbpassword@dbhost:dbport/dbname' 4​#SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://dbuser:dbpassword@dbhost:dbport/dbname'
5SQLALCHEMY_DATABASE_URI = 'sqlite:////var/tmp/resultsdb_db.sqlite' 5​SQLALCHEMY_DATABASE_URI = 'sqlite:////var/tmp/resultsdb_db.sqlite'
6FILE_LOGGING = False 6​FILE_LOGGING = False
7LOGFILE = '/var/log/resultsdb/resultsdb.log' 7​LOGFILE = '/var/log/resultsdb/resultsdb.log'
8SYSLOG_LOGGING = False 8​SYSLOG_LOGGING = False
9STREAM_LOGGING = True 9​STREAM_LOGGING = True
10#SHOW_DB_URI = False 10​#SHOW_DB_URI = False
11RUN_HOST= '0.0.0.0' 11​RUN_HOST= '0.0.0.0'
12RUN_PORT = 5001 12​RUN_PORT = 5001
13# the format of the fully qualified topic of a fedmsg is 13​
14​
15​# Set this to True or False to enable publishing to a message bus
16​MESSAGE_BUS_PUBLISH = False
17​# Name of the message bus plugin to use goes here. 'fedmsg' is installed by
18​# default, but you could create your own.
19​MESSAGE_BUS_PLUGIN = 'fedmsg'
20​# You can pass extra arguments to your message bus plugin here. For instance,
21​# the fedmsg plugin expects an extra `modname` argument that can be used to
22​# configure the topic, like this:
14# <topic_prefix>.<environment>.<modname>.<topic> 23​# <topic_prefix>.<environment>.<modname>.<topic>
15# e.g. org.fedoraproject.prod.taskotron.result.new 24​# e.g. org.fedoraproject.prod.taskotron.result.new
16FEDMSG_PUBLISH = False 25​MESSAGE_BUS_KWARGS = {'modname': 'resultsdb'}
17FEDMSG_MODNAME = 'resultsdb' ​
View Options

resultsdb/config.py

Show All 32 Lines22class Config(object):
33 33​
34 PRODUCTION = False 34​ PRODUCTION = False
35 35​
36 SHOW_DB_URI = False 36​ SHOW_DB_URI = False
37 37​
38 FEDMENU_URL = 'https://apps.fedoraproject.org/fedmenu' 38​ FEDMENU_URL = 'https://apps.fedoraproject.org/fedmenu'
39 FEDMENU_DATA_URL = 'https://apps.fedoraproject.org/js/data.js' 39​ FEDMENU_DATA_URL = 'https://apps.fedoraproject.org/js/data.js'
40 40​
41 FEDMSG_PUBLISH = False 41​ MESSAGE_BUS_PUBLISH = False
42 FEDMSG_MODNAME = 'resultsdb' 42​ MESSAGE_BUS_PLUGIN = 'dummy'
43​ MESSAGE_BUS_KWARGS = {}
43 44​
44 45​
45class ProductionConfig(Config): 46​class ProductionConfig(Config):
46 DEBUG = False 47​ DEBUG = False
47 PRODUCTION = True 48​ PRODUCTION = True
48 FEDMSG_PUBLISH = True 49​ MESSAGE_BUS_PUBLISH = True
50​ MESSAGE_BUS_PLUGIN = 'fedmsg'
51​ MESSAGE_BUS_KWARGS = {'modname': 'resultsdb'}
49 52​
50 53​
51class DevelopmentConfig(Config): 54​class DevelopmentConfig(Config):
52 TRAP_BAD_REQUEST_ERRORS = True 55​ TRAP_BAD_REQUEST_ERRORS = True
53 SQLALCHEMY_DATABASE_URI = 'sqlite:////var/tmp/resultsdb_db.sqlite' 56​ SQLALCHEMY_DATABASE_URI = 'sqlite:////var/tmp/resultsdb_db.sqlite'
54 SHOW_DB_URI = True 57​ SHOW_DB_URI = True
58​ MESSAGE_BUS_PUBLISH = True
55 59​
56 60​
57class TestingConfig(Config): 61​class TestingConfig(Config):
58 TRAP_BAD_REQUEST_ERRORS = True 62​ TRAP_BAD_REQUEST_ERRORS = True
59 TESTING = True 63​ TESTING = True
60 FEDMENU_URL = 'https://apps.stg.fedoraproject.org/fedmenu' 64​ FEDMENU_URL = 'https://apps.stg.fedoraproject.org/fedmenu'
61 FEDMENU_DATA_URL = 'https://apps.stg.fedoraproject.org/js/data.js' 65​ FEDMENU_DATA_URL = 'https://apps.stg.fedoraproject.org/js/data.js'
66​ MESSAGE_BUS_PUBLISH = True
View Options

resultsdb/controllers/api_v1.py

Show All 27 Lines
28from sqlalchemy import exc as sqlalchemy_exc 28​from sqlalchemy import exc as sqlalchemy_exc
29from werkzeug.exceptions import HTTPException 29​from werkzeug.exceptions import HTTPException
30 30​
31 31​
32# removed in flask 0.10 from flask.exceptions import JSONBadRequest 32​# removed in flask 0.10 from flask.exceptions import JSONBadRequest
33from werkzeug.exceptions import BadRequest as JSONBadRequest 33​from werkzeug.exceptions import BadRequest as JSONBadRequest
34 34​
35import iso8601 35​import iso8601
36import fedmsg ​
37 36​
38from resultsdb import app, db 37​from resultsdb import app, db
39from resultsdb.serializers.api_v1 import Serializer 38​from resultsdb.serializers.api_v1 import Serializer
40from resultsdb.models.results import Group, Result, Testcase, ResultData 39​from resultsdb.models.results import Group, Result, Testcase, ResultData
41from resultsdb.models.results import JOB_STATUS, RESULT_OUTCOME 40​from resultsdb.models.results import JOB_STATUS, RESULT_OUTCOME
41​from resultsdb.messaging import load_messaging_plugin
42 42​
43QUERY_LIMIT = 20 43​QUERY_LIMIT = 20
44 44​
45api = Blueprint('api_v1', __name__) 45​api = Blueprint('api_v1', __name__)
46 46​
47# TODO: find out why error handler works for 404 but not fot 400 47​# TODO: find out why error handler works for 404 but not fot 400
48 48​
49 49​
▲ Show 20 Lines • Show All 509 Lines • ▼ Show 20 Line(s)541 if args['result_data'] is not None:
559 for key, value in to_store: 559​ for key, value in to_store:
560 ResultData(result, key, value) 560​ ResultData(result, key, value)
561 561​
562 db.session.add(result) 562​ db.session.add(result)
563 db.session.commit() 563​ db.session.commit()
564 564​
565 db.session.add(result) 565​ db.session.add(result)
566 566​
567 if app.config['FEDMSG_PUBLISH']: 567​ if app.config['MESSAGE_BUS_PUBLISH']:
568 prev_result = get_prev_result(result) 568​ prev_result = get_prev_result(result)
569 # result is considered duplicate of prev_result when 569​ # result is considered duplicate of prev_result when
570 # outcomes are the same. 570​ # outcomes are the same.
571 if not prev_result or prev_result.outcome != result.outcome: 571​ if not prev_result or prev_result.outcome != result.outcome:
572 msg = create_fedmsg(result, prev_result) 572​ plugin = load_messaging_plugin(
573 fedmsg.publish(**msg) 573​ name=app.config['MESSAGE_BUS_PLUGIN'],
574​ kwargs=app.config['MESSAGE_BUS_KWARGS'],
575​ )
576​ plugin.publish(plugin.create_message(result, prev_result))
574 577​
575 return jsonify(SERIALIZE(result)), 201 578​ return jsonify(SERIALIZE(result)), 201
576 579​
577 580​
578def get_prev_result(result): 581​def get_prev_result(result):
579 ''' 582​ '''
580 Find previous result with the same: 583​ Find previous result with the same:
581 item, testcase, outcome and arch. 584​ item, testcase, outcome and arch.
Show All 11 Lines594 if result_data.key in ['item', 'arch']:
593 q = q.join(alias).filter( 596​ q = q.join(alias).filter(
594 db.and_(alias.key == result_data.key, alias.value == result_data.value)) 597​ db.and_(alias.key == result_data.key, alias.value == result_data.value))
595 598​
596 q = q.order_by(db.desc(Result.submit_time)) 599​ q = q.order_by(db.desc(Result.submit_time))
597 600​
598 return q.first() 601​ return q.first()
599 602​
600 603​
601def create_fedmsg(result, prev_result=None): ​
602 task = dict((result_data.key, result_data.value) for result_data in result.data ​
603 if result_data.key in ['item', 'type']) ​
604 task['name'] = result.testcase.name ​
605 return { ​
606 'topic': 'result.new', ​
607 'modname': app.config['FEDMSG_MODNAME'], ​
608 'msg': { ​
609 'task': task, ​
610 'result': { ​
611 'id': result.id, ​
612 'submit_time': result.submit_time.strftime("%Y-%m-%d %H:%M:%S UTC"), ​
613 'prev_outcome': prev_result.outcome if prev_result else None, ​
614 'outcome': result.outcome, ​
615 'job_url': result.job.ref_url, ​
616 'log_url': result.ref_url, ​
617 } ​
618 } ​
619 } ​
620 ​
621 ​
622# ============================================================================= 604​# =============================================================================
623# TESTCASES 605​# TESTCASES
624# ============================================================================= 606​# =============================================================================
625 607​
626RP['get_testcases'] = reqparse.RequestParser() 608​RP['get_testcases'] = reqparse.RequestParser()
627RP['get_testcases'].add_argument('page', default=0, type=int, location='args') 609​RP['get_testcases'].add_argument('page', default=0, type=int, location='args')
628RP['get_testcases'].add_argument('limit', default=QUERY_LIMIT, type=int, location='args') 610​RP['get_testcases'].add_argument('limit', default=QUERY_LIMIT, type=int, location='args')
629# These two are ignored. They're present so reqparse isn't confused by JSONP. 611​# These two are ignored. They're present so reqparse isn't confused by JSONP.
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines
View Options

resultsdb/controllers/api_v2.py

Show All 25 Lines
26 26​
27from sqlalchemy.orm import exc as orm_exc 27​from sqlalchemy.orm import exc as orm_exc
28from werkzeug.exceptions import HTTPException 28​from werkzeug.exceptions import HTTPException
29 29​
30 30​
31from werkzeug.exceptions import BadRequest as JSONBadRequest 31​from werkzeug.exceptions import BadRequest as JSONBadRequest
32 32​
33import iso8601 33​import iso8601
34import fedmsg ​
35 34​
36from resultsdb import app, db 35​from resultsdb import app, db
37from resultsdb.serializers.api_v2 import Serializer 36​from resultsdb.serializers.api_v2 import Serializer
38from resultsdb.models.results import Group, Result, Testcase, ResultData 37​from resultsdb.models.results import Group, Result, Testcase, ResultData
39from resultsdb.models.results import RESULT_OUTCOME 38​from resultsdb.models.results import RESULT_OUTCOME
39​from resultsdb.messaging import load_messaging_plugin
40 40​
41QUERY_LIMIT = 20 41​QUERY_LIMIT = 20
42 42​
43api = Blueprint('api_v2', __name__) 43​api = Blueprint('api_v2', __name__)
44 44​
45# TODO: find out why error handler works for 404 but not for 400 45​# TODO: find out why error handler works for 404 but not for 400
46 46​
47 47​
▲ Show 20 Lines • Show All 527 Lines • ▼ Show 20 Line(s)557 if isinstance(args['data'], dict):
575 for key, value in to_store: 575​ for key, value in to_store:
576 ResultData(result, key, value) 576​ ResultData(result, key, value)
577 577​
578 db.session.add(result) 578​ db.session.add(result)
579 db.session.commit() 579​ db.session.commit()
580 580​
581 db.session.add(result) 581​ db.session.add(result)
582 582​
583 if app.config['FEDMSG_PUBLISH']: 583​ if app.config['MESSAGE_BUS_PUBLISH']:
584 fedmsg.publish(**create_fedmsg(result)) 584​ prev_result = get_prev_result(result)
585​ # result is considered duplicate of prev_result when
586​ # outcomes are the same.
587​ if not prev_result or prev_result.outcome != result.outcome:
588​ plugin = load_messaging_plugin(
589​ name=app.config['MESSAGE_BUS_PLUGIN'],
590​ kwargs=app.config['MESSAGE_BUS_KWARGS'],
591​ )
592​ plugin.publish(plugin.create_message(result, prev_result))
593​
585 594​
586 return jsonify(SERIALIZE(result)), 201 595​ return jsonify(SERIALIZE(result)), 201
587 596​
588 597​
589def get_prev_result(result): 598​def get_prev_result(result):
590 """ 599​ """
591 Find previous result with the same testcase, item, type, and arch. 600​ Find previous result with the same testcase, item, type, and arch.
592 Return None if no result is found. 601​ Return None if no result is found.
593 """ 602​ """
594 q = db.session.query(Result).filter(Result.id != result.id) 603​ q = db.session.query(Result).filter(Result.id != result.id)
595 q = q.filter_by(testcase_name=result.testcase_name) 604​ q = q.filter_by(testcase_name=result.testcase_name)
596 605​
597 for result_data in result.data: 606​ for result_data in result.data:
598 if result_data.key in ['item', 'type', 'arch']: 607​ if result_data.key in ['item', 'type', 'arch']:
599 alias = db.aliased(ResultData) 608​ alias = db.aliased(ResultData)
600 q = q.join(alias).filter( 609​ q = q.join(alias).filter(
601 db.and_(alias.key == result_data.key, alias.value == result_data.value)) 610​ db.and_(alias.key == result_data.key, alias.value == result_data.value))
602 611​
603 q = q.order_by(db.desc(Result.submit_time)) 612​ q = q.order_by(db.desc(Result.submit_time))
604 return q.first() 613​ return q.first()
605 614​
606 615​
607def create_fedmsg(result): ​
608 prev_result = get_prev_result(result) ​
609 if prev_result and prev_result.outcome == result.outcome: ​
610 return ​
611 ​
612 task = dict((result_data.key, result_data.value) for result_data in result.data ​
613 if result_data.key in ['item', 'type']) ​
614 task['name'] = result.testcase.name ​
615 msg = { ​
616 'topic': 'result.new', ​
617 'modname': app.config['FEDMSG_MODNAME'], ​
618 'msg': { ​
619 'task': task, ​
620 'result': { ​
621 'id': result.id, ​
622 'submit_time': result.submit_time.strftime("%Y-%m-%d %H:%M:%S UTC"), ​
623 'prev_outcome': prev_result.outcome if prev_result else None, ​
624 'outcome': result.outcome, ​
625 'group_url': result.group.ref_url, ​
626 'log_url': result.ref_url, ​
627 } ​
628 } ​
629 } ​
630 return msg ​
631 ​
632 ​
633# ============================================================================= 616​# =============================================================================
634# TESTCASES 617​# TESTCASES
635# ============================================================================= 618​# =============================================================================
636 619​
637def select_testcases(args_name=None, args_name_like=None): 620​def select_testcases(args_name=None, args_name_like=None):
638 q = db.session.query(Testcase).order_by(db.asc(Testcase.name)) 621​ q = db.session.query(Testcase).order_by(db.asc(Testcase.name))
639 622​
640 name_filters = [] 623​ name_filters = []
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines
View Options

resultsdb/messaging.py

  • This file was added.
1​# Copyright 2016, Red Hat, Inc
2​#
3​# This program is free software; you can redistribute it and/or modify
4​# it under the terms of the GNU General Public License as published by
5​# the Free Software Foundation; either version 2 of the License, or
6​# (at your option) any later version.
7​#
8​# This program is distributed in the hope that it will be useful,
9​# but WITHOUT ANY WARRANTY; without even the implied warranty of
10​# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11​# GNU General Public License for more details.
12​#
13​# You should have received a copy of the GNU General Public License along
14​# with this program; if not, write to the Free Software Foundation, Inc.,
15​# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
16​#
17​# Authors:
18​# Ralph Bean <rbean@redhat.com>
19​
20​import abc
21​
22​import pkg_resources
23​
24​import fedmsg
25​
26​import logging
27​log = logging.getLogger(__name__)
28​
29​
30​class MessagingPlugin(object):
31​ """ Abstract base class that messaging plugins must extend.
32​
33​ Two abstract methods are declared which must be implemented:
34​ - create_message(result, prev_result=None)
35​ - publish(message)
36​
37​ """
38​ __metaclass__ = abc.ABCMeta
39​
40​ def __init__(self, **kwargs):
41​ for key, value in kwargs.items():
42​ setattr(self, key, value)
43​
44​ @abc.abstractmethod
45​ def create_message(self, result, prev_result=None):
46​ pass
47​
48​ @abc.abstractmethod
49​ def publish(self, message):
50​ pass
51​
52​
53​class DummyPlugin(MessagingPlugin):
54​ """ A dummy plugin used for testing. Just logs the messages. """
55​ # A class attribute where we store all messages published.
56​ # Used by the test suite. This would cause a memory leak if used in prod.
57​ history = []
58​
59​ def publish(self, message):
60​ self.history.append(message)
61​ log.info("%r->%r" % (self, message))
62​
63​ def create_message(self, result, prev_result):
64​ return dict(id=result.id)
65​
66​
67​class FedmsgPlugin(MessagingPlugin):
68​ """ A fedmsg plugin, used to publish to the fedmsg bus. """
69​
70​ def publish(self, message):
71​ fedmsg.publish(**message)
72​
73​ def create_message(self, result, prev_result):
74​ task = dict(
75​ (datum.key, datum.value)
76​ for datum in result.data
77​ if datum.key in ('item', 'type',)
78​ )
79​ task['name'] = result.testcase.name
80​ msg = {
81​ 'topic': 'result.new',
82​ 'modname': self.modname,
83​ 'msg': {
84​ 'task': task,
85​ 'result': {
86​ 'id': result.id,
87​ 'submit_time': result.submit_time.strftime("%Y-%m-%d %H:%M:%S UTC"),
88​ 'prev_outcome': prev_result.outcome if prev_result else None,
89​ 'outcome': result.outcome,
90​ 'log_url': result.ref_url,
91​ }
92​ }
93​ }
94​
95​ # For the v1 API
96​ if hasattr(result, 'job'):
97​ msg['msg']['result']['job_url'] = result.job.ref_url
98​
99​ # For the v2 API
100​ if hasattr(result, 'group'):
101​ msg['msg']['result']['group_url'] = result.group.ref_url
102​
103​ return msg
104​
105​
106​def load_messaging_plugin(name, kwargs):
107​ """ Instantiate and return the appropriate messaging plugin. """
108​ points = pkg_resources.iter_entry_points('resultsdb.messaging.plugins')
109​ classes = dict([(point.name, point.load()) for point in points])
110​
111​ log.debug("Found the following installed messaging plugin %r" % classes)
112​ if name not in classes:
113​ raise KeyError("%r not found in %r" % (name, classes.keys()))
114​
115​ cls = classes[name]
116​
117​ # Sanity check
118​ if not issubclass(cls, MessagingPlugin):
119​ raise TypeError("%s %r does not extend MessagingPlugin." % (name, cls))
120​
121​ log.debug("Instantiating plugin %r named %s" % (cls, name))
122​ return cls(**kwargs)
View Options

setup.py

Show All 20 Lines
21setup(name='resultsdb', 21​setup(name='resultsdb',
22 version=find_version('resultsdb', '__init__.py'), 22​ version=find_version('resultsdb', '__init__.py'),
23 description='Results store for the Taskbot', 23​ description='Results store for the Taskbot',
24 author='Josef Skladanka', 24​ author='Josef Skladanka',
25 author_email='jskladan@redhat.com', 25​ author_email='jskladan@redhat.com',
26 license='GPLv2+', 26​ license='GPLv2+',
27 packages=['resultsdb', 'resultsdb.controllers', 'resultsdb.models', 'resultsdb.serializers'], 27​ packages=['resultsdb', 'resultsdb.controllers', 'resultsdb.models', 'resultsdb.serializers'],
28 package_dir={'resultsdb': 'resultsdb'}, 28​ package_dir={'resultsdb': 'resultsdb'},
29 entry_points=dict(console_scripts=['resultsdb=resultsdb.cli:main']), 29​ entry_points={
30​ 'console_scripts': ['resultsdb=resultsdb.cli:main'],
31​ 'resultsdb.messaging.plugins': [
32​ 'dummy=resultsdb.messaging:DummyPlugin',
33​ 'fedmsg=resultsdb.messaging:FedmsgPlugin',
34​ ],
35​ },
30 include_package_data=True, 36​ include_package_data=True,
31 ) 37​ )
View Options

testing/functest_api_v20.py

Show All 19 Lines
20import json 20​import json
21import datetime 21​import datetime
22import os 22​import os
23import tempfile 23​import tempfile
24import copy 24​import copy
25 25​
26import resultsdb 26​import resultsdb
27import resultsdb.cli 27​import resultsdb.cli
28​import resultsdb.messaging
28 29​
29 30​
30class AboutTime(object): 31​class AboutTime(object):
31 32​
32 def __eq__(self, value): 33​ def __eq__(self, value):
33 start = (datetime.datetime.utcnow() - datetime.timedelta(seconds=10)).isoformat() 34​ start = (datetime.datetime.utcnow() - datetime.timedelta(seconds=10)).isoformat()
34 stop = (datetime.datetime.utcnow() + datetime.timedelta(seconds=10)).isoformat() 35​ stop = (datetime.datetime.utcnow() + datetime.timedelta(seconds=10)).isoformat()
35 return start <= value <= stop 36​ return start <= value <= stop
36 37​
37 38​
38class TestFuncApiV20(): 39​class TestFuncApiV20():
39 40​
40 @classmethod 41​ @classmethod
41 def setup_class(cls): 42​ def setup_class(cls):
42 cls.dbfile = tempfile.NamedTemporaryFile(delete=False) 43​ cls.dbfile = tempfile.NamedTemporaryFile(delete=False)
43 cls.dbfile.close() 44​ cls.dbfile.close()
44 resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name 45​ resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name
45 resultsdb.app.config['FEDMSG_PUBLISH'] = False 46​ resultsdb.app.config['MESSAGE_BUS_PUBLISH'] = True
47​ resultsdb.app.config['MESSAGE_BUS_PLUGIN'] = 'dummy'
46 48​
47 @classmethod 49​ @classmethod
48 def teardown_class(cls): 50​ def teardown_class(cls):
49 os.unlink(cls.dbfile.name) 51​ os.unlink(cls.dbfile.name)
50 52​
51 def setup_method(self, method): 53​ def setup_method(self, method):
52 resultsdb.cli.initialize_db(destructive=True) 54​ resultsdb.cli.initialize_db(destructive=True)
53 self.app = resultsdb.app.test_client() 55​ self.app = resultsdb.app.test_client()
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)94 self.ref_result = {
96 'submit_time': AboutTime(), 98​ 'submit_time': AboutTime(),
97 'outcome': self.ref_result_outcome, 99​ 'outcome': self.ref_result_outcome,
98 'note': self.ref_result_note, 100​ 'note': self.ref_result_note,
99 'ref_url': self.ref_result_ref_url, 101​ 'ref_url': self.ref_result_ref_url,
100 'data': dict(((key, [value] if isinstance(value, basestring) else value) for key, value in self.ref_result_data.iteritems())), 102​ 'data': dict(((key, [value] if isinstance(value, basestring) else value) for key, value in self.ref_result_data.iteritems())),
101 'href': self.ref_url_prefix + '/results/1', 103​ 'href': self.ref_url_prefix + '/results/1',
102 } 104​ }
103 105​
106​ def teardown_method(self, method):
107​ # Reset this for each test.
108​ resultsdb.messaging.DummyPlugin.history = []
109​
104 # =============== TESTCASES ================== 110​ # =============== TESTCASES ==================
105 111​
106 def helper_create_testcase(self, name=None, ref_url=None): 112​ def helper_create_testcase(self, name=None, ref_url=None):
107 if name is None: 113​ if name is None:
108 name = self.ref_testcase_name 114​ name = self.ref_testcase_name
109 if ref_url is None: 115​ if ref_url is None:
110 ref_url = self.ref_testcase_ref_url 116​ ref_url = self.ref_testcase_ref_url
111 ref_data = json.dumps({'name': name, 'ref_url': ref_url}) 117​ ref_data = json.dumps({'name': name, 'ref_url': ref_url})
▲ Show 20 Lines • Show All 606 Lines • ▼ Show 20 Line(s)684 def test_get_results_latest_modifiers(self):
718 r = self.app.get('/api/v2.0/results/latest?groups=%s' % self.ref_group_uuid) 724​ r = self.app.get('/api/v2.0/results/latest?groups=%s' % self.ref_group_uuid)
719 data = json.loads(r.data) 725​ data = json.loads(r.data)
720 726​
721 assert len(data['data']) == 2 727​ assert len(data['data']) == 2
722 assert data['data'][0]['testcase']['name'] == self.ref_testcase_name 728​ assert data['data'][0]['testcase']['name'] == self.ref_testcase_name
723 assert data['data'][0]['outcome'] == "FAILED" 729​ assert data['data'][0]['outcome'] == "FAILED"
724 assert data['data'][1]['testcase']['name'] == self.ref_testcase_name + ".1" 730​ assert data['data'][1]['testcase']['name'] == self.ref_testcase_name + ".1"
725 assert data['data'][1]['outcome'] == "PASSED" 731​ assert data['data'][1]['outcome'] == "PASSED"
732​
733​ def test_message_publication(self):
734​ self.helper_create_result()
735​ plugin = resultsdb.messaging.DummyPlugin
736​ assert len(plugin.history) == 1, plugin.history
737​ assert plugin.history == [{'id': 1}]
View Options

testing/functest_create_fedmsg.py

Show All 20 Lines
21import datetime 21​import datetime
22import os 22​import os
23import tempfile 23​import tempfile
24import copy 24​import copy
25 25​
26import resultsdb 26​import resultsdb
27import resultsdb.cli 27​import resultsdb.cli
28import resultsdb.controllers.api_v2 as apiv2 28​import resultsdb.controllers.api_v2 as apiv2
29​import resultsdb.messaging
29 30​
30 31​
31class MyResultData(object): 32​class MyResultData(object):
32 33​
33 def __init__(self, key, value): 34​ def __init__(self, key, value):
34 self.key = key 35​ self.key = key
35 self.value = value 36​ self.value = value
36 37​
Show All 21 Lines
58 59​
59class TestFuncCreateFedmsg(): 60​class TestFuncCreateFedmsg():
60 61​
61 @classmethod 62​ @classmethod
62 def setup_class(cls): 63​ def setup_class(cls):
63 cls.dbfile = tempfile.NamedTemporaryFile(delete=False) 64​ cls.dbfile = tempfile.NamedTemporaryFile(delete=False)
64 cls.dbfile.close() 65​ cls.dbfile.close()
65 resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name 66​ resultsdb.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///%s' % cls.dbfile.name
66 resultsdb.app.config['FEDMSG_PUBLISH'] = False 67​ resultsdb.app.config['MESSAGE_BUS_PUBLISH'] = True
68​ resultsdb.app.config['MESSAGE_BUS_PLUGIN'] = 'dummy'
67 69​
68 @classmethod 70​ @classmethod
69 def teardown_class(cls): 71​ def teardown_class(cls):
70 os.unlink(cls.dbfile.name) 72​ os.unlink(cls.dbfile.name)
71 73​
72 def setup_method(self, method): 74​ def setup_method(self, method):
73 resultsdb.cli.initialize_db(destructive=True) 75​ resultsdb.cli.initialize_db(destructive=True)
74 self.app = resultsdb.app.test_client() 76​ self.app = resultsdb.app.test_client()
Show All 16 Lines91 self.ref_result_data = {
91 'type': self.ref_result_type, 93​ 'type': self.ref_result_type,
92 'arch': self.ref_result_arch, 94​ 'arch': self.ref_result_arch,
93 'moo': ['boo', 'woof'], 95​ 'moo': ['boo', 'woof'],
94 } 96​ }
95 self.ref_result_ref_url = 'http://example.com/testing.result' 97​ self.ref_result_ref_url = 'http://example.com/testing.result'
96 self.ref_result_obj = MyResult( 98​ self.ref_result_obj = MyResult(
97 0, self.ref_testcase_name, self.ref_result_outcome, self.ref_result_item, self.ref_result_type, self.ref_result_arch) 99​ 0, self.ref_testcase_name, self.ref_result_outcome, self.ref_result_item, self.ref_result_type, self.ref_result_arch)
98 100​
101​ def teardown_method(self, method):
102​ # Reset this for each test.
103​ resultsdb.messaging.DummyPlugin.history = []
104​
99 def helper_create_result(self, outcome=None, groups=None, testcase=None, data=None): 105​ def helper_create_result(self, outcome=None, groups=None, testcase=None, data=None):
100 if outcome is None: 106​ if outcome is None:
101 outcome = self.ref_result_outcome 107​ outcome = self.ref_result_outcome
102 if groups is None: 108​ if groups is None:
103 groups = [self.ref_group_uuid] 109​ groups = [self.ref_group_uuid]
104 if testcase is None: 110​ if testcase is None:
105 testcase = self.ref_testcase_name 111​ testcase = self.ref_testcase_name
106 if data is None: 112​ if data is None:
▲ Show 20 Lines • Show All 87 Lines • ▼ Show 20 Line(s)195 def test_get_prev_result_different_arch(self):
194 prev_result = apiv2.get_prev_result(self.ref_result_obj) 200​ prev_result = apiv2.get_prev_result(self.ref_result_obj)
195 assert prev_result is None 201​ assert prev_result is None
196 202​
197 def test_get_prev_result_different_testcase_name(self): 203​ def test_get_prev_result_different_testcase_name(self):
198 self.helper_create_result(testcase={'name': self.ref_testcase_name + '.fake'}) 204​ self.helper_create_result(testcase={'name': self.ref_testcase_name + '.fake'})
199 205​
200 prev_result = apiv2.get_prev_result(self.ref_result_obj) 206​ prev_result = apiv2.get_prev_result(self.ref_result_obj)
201 assert prev_result is None 207​ assert prev_result is None
208​
209​ def test_message_publication(self):
210​ self.helper_create_result()
211​ plugin = resultsdb.messaging.DummyPlugin
212​ assert len(plugin.history) == 1, plugin.history
213​ assert plugin.history == [{'id': 1}]