| kparal | |
| tflink | |
| mkrizek |
| libtaskotron |
Changes resultsdb directive to use the new api/workflow when creating results.
Once we deploy new ExecDB, I'd like to move the "create_resultsdb_group" to
ExecDB, which would actually create the group, with a meaningfull description,
and resultsdb directive would then only use the uuid to reference it.
unittests updated
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| libtaskotron/directives/resultsdb_directive.py | ||
|---|---|---|
| 150 | Can you add '/%s' % name to the end, so that it leads e.g. to https://fedoraproject.org/wiki/Taskotron/Tasks/dist.depcheck ? (We'll need to move the existing pages of course). We can then tell people to pester task maintainers to create documentation for their tasks (rpmgrill etc), or even let community create some documentation themselves. We'll also need to change our current testcases to follow the same scheme. | |
| Path | Packages | |||
|---|---|---|---|---|
| M | libtaskotron/directives/resultsdb_directive.py (48 lines) | |||
| M | testing/functest_resultsdb_directive.py (18 lines) | |||
| M | testing/test_resultsdb_directive.py (58 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 76e34b940430 | 61955ef0af1b | 3c5224ab226b | Josef Skladanka | Update ResulsDB directive to work with API v2.0 (Show More…) | Oct 5 2016, 12:26 PM |
| Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Line(s) | 140 | try: | |||
|---|---|---|---|---|---|
| 142 | self._ensured_testcases.append(name) | 142 | self._ensured_testcases.append(name) | ||
| 143 | return | 143 | return | ||
| 144 | except resultsdb_api.ResultsDBapiException, e: | 144 | except resultsdb_api.ResultsDBapiException, e: | ||
| 145 | if not e.message.startswith('Testcase not found'): | 145 | if not e.message.startswith('Testcase not found'): | ||
| 146 | raise e | 146 | raise e | ||
| 147 | 147 | | |||
| 148 | # since the testcase doesn't exist, create it with a dummy value for url | 148 | # since the testcase doesn't exist, create it with a dummy value for url | ||
| 149 | # it can be updated later when it's not blocking results reporting | 149 | # it can be updated later when it's not blocking results reporting | ||
| 150 | dummyurl = 'http://faketestcasesRus.com/%s' % name | 150 | dummyurl = 'https://fedoraproject.org/wiki/Taskotron/Tasks/%s' % name | ||
| 151 | self.resultsdb.create_testcase(name, dummyurl) | 151 | self.resultsdb.create_testcase(name, dummyurl) | ||
| 152 | self._ensured_testcases.append(name) | 152 | self._ensured_testcases.append(name) | ||
| 153 | 153 | | |||
| 154 | def create_resultsdb_job(self, name, uuid=None, refurl=None): | 154 | def create_resultsdb_group(self, uuid, name=None, refurl=None): | ||
| 155 | """ Create a job in resultsdb for reporting results against | 155 | """Prepare Group data for the Result | ||
| 156 | 156 | | |||
| 157 | :param str name: name of job to report against | 157 | :param str name: name of group to report against | ||
| 158 | :param str uuid: UUID of the job (most probably provided by ExecDB) | 158 | :param str uuid: UUID of the group (most probably provided by ExecDB) | ||
| 159 | :param str refurl: url pointing to the execution overview. | 159 | :param str refurl: url pointing to the execution overview. | ||
| 160 | If set to None, ExecDB url is created from UUID | 160 | If set to None, ExecDB url is created from UUID | ||
| 161 | :returns: dict of rendered json results | 161 | :returns: dict containing the relevant group object data | ||
| 162 | """ | 162 | """ | ||
| 163 | 163 | | |||
| 164 | url = "%s/%s" % (self.execdb_server, uuid) | 164 | url = "%s/%s" % (self.execdb_server, uuid) | ||
| 165 | if refurl is not None: | 165 | if refurl is not None: | ||
| 166 | url = refurl | 166 | url = refurl | ||
| 167 | 167 | | |||
| 168 | jobdata = self.resultsdb.create_job(url, status='SCHEDULED', name=name, | 168 | group_data = {'uuid': uuid, 'ref_url': url} | ||
| 169 | uuid=uuid) | 169 | if name: | ||
| 170 | self.resultsdb.update_job(id=jobdata['id'], status='RUNNING') | 170 | group_data['description'] = name | ||
| 171 | 171 | return group_data | |||
| 172 | return jobdata | | |||
| 173 | | ||||
| 174 | def complete_resultsdb_job(self, jobid): | | |||
| 175 | """ Change the resultsdb job to a status of ``COMPLETED``, indicating | | |||
| 176 | that the reporting is complete. | | |||
| 177 | | ||||
| 178 | :param int jobid: The resultsdb jobid to be modified | | |||
| 179 | :returns: json representation of returned data from the resultsdb instance | | |||
| 180 | """ | | |||
| 181 | return self.resultsdb.update_job(jobid, status='COMPLETED') | | |||
| 182 | 172 | | |||
| 183 | def get_artifact_path(self, artifactsdir, artifact): | 173 | def get_artifact_path(self, artifactsdir, artifact): | ||
| 184 | """Return the relative path of :attr str artifact: inside the | 174 | """Return the relative path of :attr str artifact: inside the | ||
| 185 | :attr str artifactsdir:. | 175 | :attr str artifactsdir:. | ||
| 186 | :returns: relative path to the artifact file or None, if the file | 176 | :returns: relative path to the artifact file or None, if the file | ||
| 187 | does not exist, or is outside the artifactsdir. | 177 | does not exist, or is outside the artifactsdir. | ||
| 188 | """ | 178 | """ | ||
| 189 | artifactsdir = os.path.realpath(artifactsdir) | 179 | artifactsdir = os.path.realpath(artifactsdir) | ||
| ▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Line(s) | 275 | if not conf.report_to_resultsdb: | |||
| 288 | return check.export_YAML(check_details) | 278 | return check.export_YAML(check_details) | ||
| 289 | 279 | | |||
| 290 | checkname = '%s.%s' % (arg_data['namespace'], arg_data['checkname']) | 280 | checkname = '%s.%s' % (arg_data['namespace'], arg_data['checkname']) | ||
| 291 | 281 | | |||
| 292 | # find out if the task is allowed to post results into the namespace | 282 | # find out if the task is allowed to post results into the namespace | ||
| 293 | if config.get_config().profile == config.ProfileName.PRODUCTION: | 283 | if config.get_config().profile == config.ProfileName.PRODUCTION: | ||
| 294 | self.check_namespace(checkname, arg_data) | 284 | self.check_namespace(checkname, arg_data) | ||
| 295 | 285 | | |||
| 296 | # for now, we're creating the resultsdb job at reporting time | 286 | # for now, we're creating the resultsdb group at reporting time | ||
| 297 | # the job needs to be 'RUNNING' in order to append any results | 287 | _, log_url = buildbot_utils.get_urls(arg_data['jobid'], | ||
| 298 | job_url, log_url = buildbot_utils.get_urls(arg_data['jobid'], | | |||
| 299 | self.masterurl, | 288 | self.masterurl, | ||
| 300 | self.task_stepname) | 289 | self.task_stepname) | ||
| 301 | 290 | | |||
| 302 | job_data = self.create_resultsdb_job(checkname, uuid=arg_data['uuid']) | 291 | group_data = self.create_resultsdb_group(uuid=arg_data['uuid'], name=checkname) | ||
| 303 | 292 | | |||
| 304 | log.info('Posting %s results to ResultsDB...' % len(check_details)) | 293 | log.info('Posting %s results to ResultsDB...' % len(check_details)) | ||
| 305 | for detail in check_details: | 294 | for detail in check_details: | ||
| 306 | checkname = '%s.%s' % (arg_data['namespace'], | 295 | checkname = '%s.%s' % (arg_data['namespace'], | ||
| 307 | detail.checkname or arg_data['checkname']) | 296 | detail.checkname or arg_data['checkname']) | ||
| 308 | 297 | | |||
| 309 | self.ensure_testcase_exists(checkname) | 298 | self.ensure_testcase_exists(checkname) | ||
| 310 | result_log_url = log_url | 299 | result_log_url = log_url | ||
| 311 | if detail.artifact: | 300 | if detail.artifact: | ||
| 312 | artifact_path = self.get_artifact_path( | 301 | artifact_path = self.get_artifact_path( | ||
| 313 | arg_data['artifactsdir'], | 302 | arg_data['artifactsdir'], | ||
| 314 | detail.artifact | 303 | detail.artifact | ||
| 315 | ) | 304 | ) | ||
| 316 | if artifact_path: | 305 | if artifact_path: | ||
| 317 | result_log_url = "%s/all/%s/task_output/%s" % ( | 306 | result_log_url = "%s/all/%s/task_output/%s" % ( | ||
| 318 | self.artifacts_baseurl, | 307 | self.artifacts_baseurl, | ||
| 319 | arg_data['uuid'], | 308 | arg_data['uuid'], | ||
| 320 | artifact_path, | 309 | artifact_path, | ||
| 321 | ) | 310 | ) | ||
| 322 | try: | 311 | try: | ||
| 323 | result = self.resultsdb.create_result( | 312 | result = self.resultsdb.create_result( | ||
| 324 | job_id=job_data['id'], | | |||
| 325 | testcase_name=checkname, | | |||
| 326 | outcome=detail.outcome, | 313 | outcome=detail.outcome, | ||
| 327 | summary=detail.note or None, | 314 | testcase=checkname, | ||
| 328 | log_url=result_log_url, | 315 | groups=[group_data], | ||
| 316 | note=detail.note or None, | ||||
| 317 | ref_url=result_log_url, | ||||
| 329 | item=detail.item, | 318 | item=detail.item, | ||
| 330 | type=detail.report_type, | 319 | type=detail.report_type, | ||
| 331 | **detail.keyvals) | 320 | **detail.keyvals) | ||
| 332 | detail._internal['resultsdb_result_id'] = result['id'] | 321 | detail._internal['resultsdb_result_id'] = result['id'] | ||
| 333 | 322 | | |||
| 334 | except resultsdb_api.ResultsDBapiException, e: | 323 | except resultsdb_api.ResultsDBapiException, e: | ||
| 335 | log.error(e) | 324 | log.error(e) | ||
| 336 | log.error("Failed to store ResulsDB: `%s` `%s` `%s`", | 325 | log.error("Failed to store ResulsDB: `%s` `%s` `%s`", | ||
| 337 | detail.item, checkname, detail.outcome) | 326 | detail.item, checkname, detail.outcome) | ||
| 338 | 327 | | |||
| 339 | # move job to completed | | |||
| 340 | self.complete_resultsdb_job(job_data['id']) | | |||
| 341 | | ||||
| 342 | return check.export_YAML(check_details) | 328 | return check.export_YAML(check_details) | ||
| Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s) | 42 | self.ref_arg_data = { | |||
|---|---|---|---|---|---|
| 48 | 'artifactsdir': '/some/directory/', | 48 | 'artifactsdir': '/some/directory/', | ||
| 49 | 'task': '/taskdir', | 49 | 'task': '/taskdir', | ||
| 50 | 'item': 'firefox-45.0.2-1.fc23' | 50 | 'item': 'firefox-45.0.2-1.fc23' | ||
| 51 | } | 51 | } | ||
| 52 | 52 | | |||
| 53 | self.ref_resultdata = {u'id': 1234} | 53 | self.ref_resultdata = {u'id': 1234} | ||
| 54 | 54 | | |||
| 55 | self.ref_jobid = 1234 | 55 | self.ref_jobid = 1234 | ||
| 56 | self.ref_uuid = 'c25237a4-b6b3-11e4-b98a-3c970e018701' | ||||
| 56 | self.ref_refurl = u'http://example.com/%s' % self.ref_arg_data['checkname'] | 57 | self.ref_refurl = u'http://example.com/%s' % self.ref_arg_data['checkname'] | ||
| 57 | self.ref_jobdata = {u'end_time': None, | 58 | self.ref_jobdata = {u'end_time': None, | ||
| 58 | u'href': u'http://127.0.0.1/api/v1.0/jobs/%d' % self.ref_jobid, | 59 | u'href': u'http://127.0.0.1/api/v1.0/jobs/%d' % self.ref_jobid, | ||
| 59 | u'id': self.ref_jobid, | 60 | u'id': self.ref_jobid, | ||
| 60 | u'name': self.ref_arg_data['checkname'], | 61 | u'name': self.ref_arg_data['checkname'], | ||
| 61 | u'ref_url': self.ref_refurl, | 62 | u'ref_url': self.ref_refurl, | ||
| 62 | u'results': [], | 63 | u'results': [], | ||
| 63 | u'results_count': 0, | 64 | u'results_count': 0, | ||
| Show All 21 Lines | 81 | def test_param_file(self, tmpdir): | |||
| 85 | 86 | | |||
| 86 | self.test_rdb.process(self.ref_input, self.ref_arg_data) | 87 | self.test_rdb.process(self.ref_input, self.ref_arg_data) | ||
| 87 | 88 | | |||
| 88 | # Given the input data, the resultsdb should be called once, and only | 89 | # Given the input data, the resultsdb should be called once, and only | ||
| 89 | # once, calling "create_result". | 90 | # once, calling "create_result". | ||
| 90 | # This assert failing either means that more calls were added in the | 91 | # This assert failing either means that more calls were added in the | ||
| 91 | # source code, or that a bug is present, and "create_result" is | 92 | # source code, or that a bug is present, and "create_result" is | ||
| 92 | # called multiple times. | 93 | # called multiple times. | ||
| 93 | # we expect rdb to be called 4 times: create job, update to RUNNING, | 94 | # we expect rdb to be called 2 times: | ||
| 94 | # check for testcase, report result and complete job | 95 | # check for testcase, and report result | ||
| 95 | 96 | | |||
| 96 | assert len(self.stub_rdb.calls()) == 5 | 97 | assert len(self.stub_rdb.calls()) == 2 | ||
| 97 | 98 | | |||
| 98 | # Select the first call of "create_result" method. | 99 | # Select the first call of "create_result" method. | ||
| 99 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | 100 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | ||
| 100 | # this is more future-proof, and accidental addition of resultsdb | 101 | # this is more future-proof, and accidental addition of resultsdb | ||
| 101 | # calls is handled by the previous assert. | 102 | # calls is handled by the previous assert. | ||
| 102 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | 103 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | ||
| 103 | # Select the keyword arguments of that call | 104 | # Select the keyword arguments of that call | ||
| 104 | call_data = call[2] | 105 | call_data = call[2] | ||
| 105 | 106 | | |||
| 106 | # the log url depends on the arg_data, so construct it here | 107 | # the log url depends on the arg_data, so construct it here | ||
| 107 | ref_builder, ref_jobid = self.ref_arg_data['jobid'].split('/') | 108 | ref_builder, ref_jobid = self.ref_arg_data['jobid'].split('/') | ||
| 108 | ref_log_url = '%s/builders/%s/builds/%s/steps/%s/logs/stdio' %\ | 109 | ref_log_url = '%s/builders/%s/builds/%s/steps/%s/logs/stdio' %\ | ||
| 109 | (self.conf.taskotron_master, ref_builder, ref_jobid, | 110 | (self.conf.taskotron_master, ref_builder, ref_jobid, | ||
| 110 | self.conf.buildbot_task_step) | 111 | self.conf.buildbot_task_step) | ||
| 111 | ref_testcase_name = '%s.%s' % (self.ref_arg_data['namespace'], | 112 | ref_testcase_name = '%s.%s' % (self.ref_arg_data['namespace'], | ||
| 112 | self.ref_arg_data['checkname']) | 113 | self.ref_arg_data['checkname']) | ||
| 113 | 114 | | |||
| 114 | assert call_data['job_id'] == self.ref_jobid | 115 | assert call_data['testcase'] == ref_testcase_name | ||
| 115 | assert call_data['testcase_name'] == ref_testcase_name | | |||
| 116 | assert call_data['outcome'] == self.cd.outcome | 116 | assert call_data['outcome'] == self.cd.outcome | ||
| 117 | assert call_data['summary'] == self.cd.note | 117 | assert call_data['note'] == self.cd.note | ||
| 118 | assert call_data['log_url'] == ref_log_url | 118 | assert call_data['ref_url'] == ref_log_url | ||
| 119 | assert call_data['item'] == self.cd.item | 119 | assert call_data['item'] == self.cd.item | ||
| 120 | assert call_data['type'] == self.cd.report_type | 120 | assert call_data['type'] == self.cd.report_type | ||
| 121 | assert len(call_data['groups']) == 1 | ||||
| 122 | group = call_data['groups'][0] | ||||
| 123 | assert group['uuid'] == self.ref_uuid | ||||
| 124 | assert group['ref_url'] == "%s/%s" % (self.test_rdb.execdb_server, self.ref_uuid) | ||||
| 121 | 125 | | |||
| 122 | assert 'output' not in call_data.keys() | 126 | assert 'output' not in call_data.keys() | ||
| 123 | 127 | | |||
| 124 | for key in self.cd.keyvals.keys(): | 128 | for key in self.cd.keyvals.keys(): | ||
| 125 | assert call_data[key] == self.cd.keyvals[key] | 129 | assert call_data[key] == self.cd.keyvals[key] | ||
| Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s) | 50 | self.ref_arg_data = { | |||
|---|---|---|---|---|---|
| 56 | 'artifactsdir': '/some/directory/', | 56 | 'artifactsdir': '/some/directory/', | ||
| 57 | 'task': '/taskdir', | 57 | 'task': '/taskdir', | ||
| 58 | 'item': 'firefox-45.0.2-1.fc23' | 58 | 'item': 'firefox-45.0.2-1.fc23' | ||
| 59 | } | 59 | } | ||
| 60 | 60 | | |||
| 61 | self.ref_resultdata = {u'id': 1234} | 61 | self.ref_resultdata = {u'id': 1234} | ||
| 62 | 62 | | |||
| 63 | self.ref_jobid = 1234 | 63 | self.ref_jobid = 1234 | ||
| 64 | self.ref_uuid = 'c25237a4-b6b3-11e4-b98a-3c970e018701' | ||||
| 64 | self.ref_refurl = u'http://example.com/%s' % self.ref_arg_data['checkname'] | 65 | self.ref_refurl = u'http://example.com/%s' % self.ref_arg_data['checkname'] | ||
| 65 | self.ref_jobdata = {u'end_time': None, | 66 | self.ref_jobdata = {'ref_url': u'http://example.com/test_resultsdb_report', | ||
| 66 | u'href': u'http://127.0.0.1/api/v1.0/jobs/%d' % self.ref_jobid, | 67 | 'uuid': 'c25237a4-b6b3-11e4-b98a-3c970e018701', | ||
| 67 | u'id': self.ref_jobid, | 68 | 'description': 'test_resultsdb_report'} | ||
| 68 | u'name': self.ref_arg_data['checkname'], | | |||
| 69 | u'ref_url': self.ref_refurl, | | |||
| 70 | u'results': [], | | |||
| 71 | u'results_count': 0, | | |||
| 72 | u'start_time': None, | | |||
| 73 | u'status': u'SCHEDULED'} | | |||
| 74 | 69 | | |||
| 75 | self.stub_rdb = Dingus('resultsdb', get_testcase__returns={}, | 70 | self.stub_rdb = Dingus('resultsdb', get_testcase__returns={}, | ||
| 76 | create_job__returns=self.ref_jobdata, | 71 | create_job__returns=self.ref_jobdata, | ||
| 77 | create_result__returns=self.ref_resultdata, | 72 | create_result__returns=self.ref_resultdata, | ||
| 78 | ) | 73 | ) | ||
| 79 | self.test_rdb = resultsdb_directive.ResultsdbDirective(self.stub_rdb) | 74 | self.test_rdb = resultsdb_directive.ResultsdbDirective(self.stub_rdb) | ||
| 80 | 75 | | |||
| 81 | # while it appears useless, this actually sets config in several tests | 76 | # while it appears useless, this actually sets config in several tests | ||
| ▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s) | 131 | def test_report(self): | |||
| 139 | 134 | | |||
| 140 | self.test_rdb.process(self.ref_input, self.ref_arg_data) | 135 | self.test_rdb.process(self.ref_input, self.ref_arg_data) | ||
| 141 | 136 | | |||
| 142 | # Given the input data, the resultsdb should be called once, and only | 137 | # Given the input data, the resultsdb should be called once, and only | ||
| 143 | # once, calling "create_result". | 138 | # once, calling "create_result". | ||
| 144 | # This assert failing either means that more calls were added in the | 139 | # This assert failing either means that more calls were added in the | ||
| 145 | # source code, or that a bug is present, and "create_result" is | 140 | # source code, or that a bug is present, and "create_result" is | ||
| 146 | # called multiple times. | 141 | # called multiple times. | ||
| 147 | # we expect rdb to be called 4 times: create job, update to RUNNING, | 142 | # we expect rdb to be called 2 times: | ||
| 148 | # check for testcase, report result and complete job | 143 | # check for testcase, and report result | ||
| 149 | 144 | | |||
| 150 | assert len(self.stub_rdb.calls()) == 5 | 145 | assert len(self.stub_rdb.calls()) == 2 | ||
| 151 | 146 | | |||
| 152 | # Select the first call of "create_result" method. | 147 | # Select the first call of "create_result" method. | ||
| 153 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | 148 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | ||
| 154 | # this is more future-proof, and accidental addition of resultsdb | 149 | # this is more future-proof, and accidental addition of resultsdb | ||
| 155 | # calls is handled by the previous assert. | 150 | # calls is handled by the previous assert. | ||
| 156 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | 151 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | ||
| 157 | # Select the keyword arguments of that call | 152 | # Select the keyword arguments of that call | ||
| 158 | call_data = call[2] | 153 | call_data = call[2] | ||
| 159 | 154 | | |||
| 160 | # the log url depends on the arg_data, so construct it here | 155 | # the log url depends on the arg_data, so construct it here | ||
| 161 | ref_builder, ref_jobid = self.ref_arg_data['jobid'].split('/') | 156 | ref_builder, ref_jobid = self.ref_arg_data['jobid'].split('/') | ||
| 162 | ref_log_url = '%s/builders/%s/builds/%s/steps/%s/logs/stdio' %\ | 157 | ref_log_url = '%s/builders/%s/builds/%s/steps/%s/logs/stdio' %\ | ||
| 163 | (self.conf.taskotron_master, ref_builder, ref_jobid, | 158 | (self.conf.taskotron_master, ref_builder, ref_jobid, | ||
| 164 | self.conf.buildbot_task_step) | 159 | self.conf.buildbot_task_step) | ||
| 165 | ref_testcase_name = '%s.%s' % (self.ref_arg_data['namespace'], | 160 | ref_testcase_name = '%s.%s' % (self.ref_arg_data['namespace'], | ||
| 166 | self.ref_arg_data['checkname']) | 161 | self.ref_arg_data['checkname']) | ||
| 167 | 162 | | |||
| 168 | assert call_data['job_id'] == self.ref_jobid | 163 | assert call_data['testcase'] == ref_testcase_name | ||
| 169 | assert call_data['testcase_name'] == ref_testcase_name | | |||
| 170 | assert call_data['outcome'] == self.cd.outcome | 164 | assert call_data['outcome'] == self.cd.outcome | ||
| 171 | assert call_data['summary'] == self.cd.note | 165 | assert call_data['note'] == self.cd.note | ||
| 172 | assert call_data['log_url'] == ref_log_url | 166 | assert call_data['ref_url'] == ref_log_url | ||
| 173 | assert call_data['item'] == self.cd.item | 167 | assert call_data['item'] == self.cd.item | ||
| 174 | assert call_data['type'] == self.cd.report_type | 168 | assert call_data['type'] == self.cd.report_type | ||
| 169 | assert len(call_data['groups']) == 1 | ||||
| 170 | group = call_data['groups'][0] | ||||
| 171 | assert group['uuid'] == self.ref_uuid | ||||
| 172 | assert group['ref_url'] == "%s/%s" % (self.test_rdb.execdb_server, self.ref_uuid) | ||||
| 175 | 173 | | |||
| 176 | assert 'output' not in call_data.keys() | 174 | assert 'output' not in call_data.keys() | ||
| 177 | 175 | | |||
| 178 | for key in self.cd.keyvals.keys(): | 176 | for key in self.cd.keyvals.keys(): | ||
| 179 | assert call_data[key] == self.cd.keyvals[key] | 177 | assert call_data[key] == self.cd.keyvals[key] | ||
| 180 | 178 | | |||
| 181 | def test_both_file_and_results(self, monkeypatch): | 179 | def test_both_file_and_results(self, monkeypatch): | ||
| 182 | ref_input = {'results': 'foobar', 'file': 'foo.bar'} | 180 | ref_input = {'results': 'foobar', 'file': 'foo.bar'} | ||
| ▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s) | 205 | def test_report_artifact_in_log_url(self, monkeypatch): | |||
| 225 | # Given the input data, the resultsdb should be called once, and only | 223 | # Given the input data, the resultsdb should be called once, and only | ||
| 226 | # once, calling "create_result". | 224 | # once, calling "create_result". | ||
| 227 | # This assert failing either means that more calls were added in the | 225 | # This assert failing either means that more calls were added in the | ||
| 228 | # source code, or that a bug is present, and "create_result" is | 226 | # source code, or that a bug is present, and "create_result" is | ||
| 229 | # called multiple times. | 227 | # called multiple times. | ||
| 230 | # we expect rdb to be called 4 times: create job, update to RUNNING, | 228 | # we expect rdb to be called 4 times: create job, update to RUNNING, | ||
| 231 | # check for testcase, report result and complete job | 229 | # check for testcase, report result and complete job | ||
| 232 | 230 | | |||
| 233 | assert len(self.stub_rdb.calls()) == 5 | 231 | assert len(self.stub_rdb.calls()) == 2 | ||
| 234 | 232 | | |||
| 235 | # Select the first call of "create_result" method. | 233 | # Select the first call of "create_result" method. | ||
| 236 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | 234 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | ||
| 237 | # this is more future-proof, and accidental addition of resultsdb | 235 | # this is more future-proof, and accidental addition of resultsdb | ||
| 238 | # calls is handled by the previous assert. | 236 | # calls is handled by the previous assert. | ||
| 239 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | 237 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | ||
| 240 | # Select the keyword arguments of that call | 238 | # Select the keyword arguments of that call | ||
| 241 | call_data = call[2] | 239 | call_data = call[2] | ||
| 242 | 240 | | |||
| 243 | # the log url depends on the arg_data, so construct it here | 241 | # the log url depends on the arg_data, so construct it here | ||
| 244 | ref_log_url = '%s/all/%s/task_output/%s' %\ | 242 | ref_log_url = '%s/all/%s/task_output/%s' %\ | ||
| 245 | (self.conf.artifacts_baseurl, self.ref_arg_data['uuid'], cd.artifact) | 243 | (self.conf.artifacts_baseurl, self.ref_arg_data['uuid'], cd.artifact) | ||
| 246 | 244 | | |||
| 247 | assert call_data['log_url'] == ref_log_url | 245 | assert call_data['ref_url'] == ref_log_url | ||
| 248 | 246 | | |||
| 249 | def test_create_job(self): | 247 | def test_create_group(self): | ||
| 250 | # make sure that the proper API calls are made to create a resultsdb job | 248 | # make sure that the proper API calls are made to create a resultsdb job | ||
| 251 | test_jobdata = self.test_rdb.create_resultsdb_job(self.ref_arg_data['checkname'], | 249 | test_jobdata = self.test_rdb.create_resultsdb_group( | ||
| 252 | self.ref_refurl) | 250 | self.ref_uuid, | ||
| 251 | self.ref_arg_data['checkname'], | ||||
| 252 | self.ref_refurl) | ||||
| 253 | 253 | | |||
| 254 | assert test_jobdata == self.ref_jobdata | 254 | assert test_jobdata == self.ref_jobdata | ||
| 255 | 255 | | |||
| 256 | rdb_calls = self.stub_rdb.calls() | 256 | rdb_calls = self.stub_rdb.calls() | ||
| 257 | # we expect only one call to resultsdb when creating a job | 257 | # we expect only one call to resultsdb when reporting a result | ||
| 258 | assert len(rdb_calls) == 2 | 258 | assert len(rdb_calls) == 0 | ||
| 259 | assert rdb_calls[0][0] == 'create_job' | | |||
| 260 | assert rdb_calls[1][0] == 'update_job' | | |||
| 261 | | ||||
| 262 | def test_complete_job(self): | | |||
| 263 | # make sure that the proper API calls are made to complete the job | | |||
| 264 | self.test_rdb.complete_resultsdb_job(self.ref_jobid) | | |||
| 265 | | ||||
| 266 | rdb_calls = self.stub_rdb.calls() | | |||
| 267 | # we expect only one call to resultsdb when completing a job | | |||
| 268 | assert len(rdb_calls) == 1 | | |||
| 269 | assert rdb_calls[0][0] == 'update_job' | | |||
| 270 | assert rdb_calls[0][2]['status'] == 'COMPLETED' | | |||
| 271 | 259 | | |||
| 272 | def test_ensure_testcase_creation_notexist(self): | 260 | def test_ensure_testcase_creation_notexist(self): | ||
| 273 | # check to see if the testcase is created in the case that it doesn't | 261 | # check to see if the testcase is created in the case that it doesn't | ||
| 274 | # already exist | 262 | # already exist | ||
| 275 | 263 | | |||
| 276 | self.stub_rdb.get_testcase = exception_raiser(ResultsDBapiException('Testcase not found')) | 264 | self.stub_rdb.get_testcase = exception_raiser(ResultsDBapiException('Testcase not found')) | ||
| 277 | 265 | | |||
| 278 | self.test_rdb.ensure_testcase_exists(self.ref_arg_data['checkname']) | 266 | self.test_rdb.ensure_testcase_exists(self.ref_arg_data['checkname']) | ||
| ▲ Show 20 Lines • Show All 106 Lines • Show Last 20 Lines | |||||
Can you add '/%s' % name to the end, so that it leads e.g. to https://fedoraproject.org/wiki/Taskotron/Tasks/dist.depcheck ? (We'll need to move the existing pages of course). We can then tell people to pester task maintainers to create documentation for their tasks (rpmgrill etc), or even let community create some documentation themselves.
We'll also need to change our current testcases to follow the same scheme.