PR#3: Changes necessary for using current ResutlsDB - fedora-qa/testdays-web

fedora-qa / testdays-web

#3 Changes necessary for using current ResutlsDB

Merged 6 years ago by jskladan. Opened 6 years ago by jskladan.

resultsdb20 into develop

Changes necessary for using current ResutlsDB

Josef Skladanka • 6 years ago

d7a3913

alembic/versions/1e0fb82777af_resultsdb_20.py

file added

+28

		`@@ -0,0 +1,28 @@`
		`+ """resultsdb_20`
		`+`
		`+ Revision ID: 1e0fb82777af`
		`+ Revises: 3e508b27e5b6`
		`+ Create Date: 2018-03-08 12:33:10.371007`
		`+`
		`+ """`
		`+`
		`+ # revision identifiers, used by Alembic.`
		`+ revision = '1e0fb82777af'`
		`+ down_revision = '3e508b27e5b6'`
		`+ branch_labels = None`
		`+ depends_on = None`
		`+`
		`+ from alembic import op`
		`+ import sqlalchemy as sa`
		`+`
		`+`
		`+ def upgrade():`
		`+ ### commands auto generated by Alembic - please adjust! ###`
		`+ op.add_column('event', sa.Column('resultsdb_job_uuid', sa.String(length=36), nullable=True))`
		`+ ### end Alembic commands ###`
		`+`
		`+`
		`+ def downgrade():`
		`+ ### commands auto generated by Alembic - please adjust! ###`
		`+ op.drop_column('event', 'resultsdb_job_uuid')`
		`+ ### end Alembic commands ###`

testdays/controllers/admin.py

file modified

+11 -8

		`@@ -31,9 +31,12 @@`
		`from testdays.lib.forms import AddEventForm`
		`from testdays.models.testday import Event, Category, Testcase, TESTCASE_TYPES`

		`+ import uuid`
		`+`
		`admin = Blueprint('admin', __name__)`

		`RDB_API = None`
		`+ UUID_NS = uuid.uuid5(uuid.NAMESPACE_DNS, 'Testdays Frontend')`

		`@app.before_first_request`
		`def before_first_request():`
		`@@ -148,14 +151,14 @@`
		`db.session.commit()`
		`db.session.add(event)`

		`- # start resultsdb job`
		`- rdb_job = RDB_API.create_job(`
		`- url_for('main.show_event', event_id=event.id),`
		`- name="Testday - %s" % event.testday_url.split('/')[-1],`
		`+ # create resultsdb group`
		`+ ref_url = url_for('main.show_event', event_id=event.id)`
		`+ rdb_job = RDB_API.create_group(`
		`+ uuid=str(uuid.uuid5(UUID_NS, ref_url)),`
		`+ ref_url=ref_url,`
		`+ description="Testday - %s" % event.testday_url.split('/')[-1],`
		`)`
		`- RDB_API.update_job(rdb_job['id'], status='RUNNING')`
		`-`
		`- event.resultsdb_job_id = rdb_job['id']`
		`+ event.resultsdb_job_uuid = rdb_job['uuid']`
		`db.session.add(event)`
		`db.session.commit()`
		`flash('Event was successfully created')`
		`@@ -168,7 +171,7 @@`
		`db.session.delete(category)`

		`event.id = old_event.id`
		`- event.resultsdb_job_id = old_event.resultsdb_job_id`
		`+ event.resultsdb_job_uuid = old_event.resultsdb_job_uuid`
		`db.session.merge(event)`
		`db.session.commit()`
		`flash('Event was successfully updated')`

testdays/controllers/main.py

file modified

+21 -31

		`@@ -45,7 +45,7 @@`

		`@main.route('/events')`
		`def events():`
		`- events = db.session.query(Event).order_by(Event.created_at)`
		`+ events = db.session.query(Event).order_by(Event.created_at.desc())`
		`return render_template('list_events.html', events=events)`


		`@@ -61,16 +61,19 @@`
		`if cached is not None:`
		`return cached`

		`- results = RDB_API.get_job(event.resultsdb_job_id)['results']`
		`-`
		`+ try:`
		`+ results_count = RDB_API.get_group(event.resultsdb_job_uuid)['results_count']`
		`+ results = RDB_API.get_results(groups=[event.resultsdb_job_uuid], limit=results_count)['data']`
		`+ except resultsdb_api.ResultsDBapiException:`
		`+ results = []`
		`# results is a list of dicts like this:`
		`# {`
		`# "href": "http://taskotron-local/resultsdb_api/api/v1.0/results/1510407",`
		`# "id": 1510407,`
		`- # "job_url": "http://taskotron-local/resultsdb_api/api/v1.0/jobs/115516",`
		`- # "log_url": null,`
		`+ # "groups": ["uuid"],`
		`+ # "ref_url": null,`
		`# "outcome": "PASSED",`
		`- # "result_data": {`
		`+ # "data": {`
		`# "bugs": [`
		`# ""`
		`# ],`
		`@@ -85,11 +88,11 @@`
		`# ]`
		`# },`
		`# "submit_time": "2015-05-14T09:20:36.392351",`
		`- # "summary": "Comment number 4",`
		`+ # "note": "Comment number 4",`
		`# "testcase": {`
		`# "href": "http://taskotron-local/resultsdb_api/api/v1.0/testcases/testdays_QA_Testcase_Power_Management_tuned_off_idle",`
		`# "name": "testdays_QA_Testcase_Power_Management_tuned_off_idle",`
		`- # "url": "http://fedoraproject.org/wiki/QA:Testcase_Power_Management_tuned_off_idle"`
		`+ # "ref_url": "http://fedoraproject.org/wiki/QA:Testcase_Power_Management_tuned_off_idle"`
		`# }`
		`# }`

		`@@ -100,22 +103,22 @@`
		`# 'result': $result,`
		`# }]}}}`
		`#`
		`- # Where $username, $col_1, and $result are from ['result_data'],`
		`- # $tcurl is the testcase url from ['testcase']['url']`
		`+ # Where $username, $col_1, and $result are from ['data'],`
		`+ # $tcurl is the testcase url from ['testcase']['ref_url']`

		`by_user = {}`
		`for result in results:`
		`- data = result['result_data']`
		`+ data = result['data']`

		`username = data['username'][0]`
		`col_1 = data['col_1'][0]`
		`- tcurl = result['testcase']['url']`
		`+ tcurl = result['testcase']['ref_url']`

		`outcome = data['result'][0]`
		`bugs = []`
		`if data['bugs'][0]:`
		`bugs = data['bugs'][0].split(';')`
		`- comment = result['summary']`
		`+ comment = result['note']`

		`by_user.setdefault(username, {})`
		`by_user[username].setdefault(col_1, {})`
		`@@ -253,10 +256,10 @@`
		`profile=profile)`

		`def testcase_to_name(testcase):`
		`- prefix = "testdays"`
		`+ prefix = "apps.testdays."`
		`name = testcase.url.split('/')[-1]`
		`name = RE_TESTCASE_NAME_NORMALIZE.sub('_', name)`
		`- return "%s_%s" % (prefix, name)`
		`+ return "%s%s" % (prefix, name)`

		`def ensure_testcase(testcase):`
		`global TESTCASES`
		`@@ -309,14 +312,14 @@`
		`testcase_name = ensure_testcase(testcase)`

		`result_dict = dict(`
		`- job_id=testcase.category.event.resultsdb_job_id,`
		`- testcase_name=testcase_name,`
		`outcome=outcome,`
		`+ testcase=testcase_name,`
		`+ groups=[testcase.category.event.resultsdb_job_uuid],`
		`+ note=form_.comment.data,`
		`result=form_.result.data,`
		`col_1=form_.col_1.data,`
		`username=form_.username.data,`
		`bugs=form_.bugs.data,`
		`- summary=form_.comment.data,`
		`)`
		`try:`
		`r = RDB_API.create_result(**result_dict)`
		`@@ -338,16 +341,3 @@`
		`form_action = url_for('.enter_result', event_id=event_id, tc_id=tc_id),`
		`header = "Enter result",`
		`)`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`
		`-`

testdays/models/testday.py

file modified

+3 -2

		`@@ -30,15 +30,16 @@`
		`metadata_url = db.Column(db.Text)`
		`testday_url = db.Column(db.Text)`
		`resultsdb_job_id = db.Column(db.Integer)`
		`+ resultsdb_job_uuid = db.Column(db.String(36))`
		`created_at = db.Column(db.DateTime, default = datetime.datetime.utcnow)`

		`categories = db.relation('Category', backref='event', order_by='Category.id')`

		`- def __init__(self, name, metadata_url, testday_url=None, resultsdb_job_id=None):`
		`+ def __init__(self, name, metadata_url, testday_url=None, resultsdb_job_uuid=None):`
		`self.name = name`
		`self.metadata_url = metadata_url`
		`self.testday_url = testday_url`
		`- self.resultsdb_job_id = resultsdb_job_id`
		`+ self.resultsdb_job_uuid = resultsdb_job_uuid`

		`class Category(db.Model):`