The resultsdb job states transition have the automagical function of filling start/end_time. Until we change the workflow, let's use the currently designed one.
NaN
| Lint Skipped |
| Unit Tests Skipped |
I tested this in my local env and after a few changes, it does produce results in resultsdb that sort properly as long as there aren't any unset times in the db.
Commandeering the review to update it with working code
| Path | |||
|---|---|---|---|
| M | libtaskotron/directives/resultsdb_directive.py (5 lines) | ||
| M | testing/test_resultsdb_directive.py (9 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 6cdf3fc5044d | 058e484583c7 | 18c145624eeb | Tim Flink | fixing unit tests to work with changed resultsdb code | Apr 29 2014, 6:20 PM |
| 18c145624eeb | bad6e069bf1a | 363470e19ab1 | Josef Skladanka | T151 - proper job status usage in resultsdb directive (Show More…) | Apr 29 2014, 6:15 PM |
| Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Line(s) | 63 | def create_resultsdb_job(self, name, refurl=None): | |||
|---|---|---|---|---|---|
| 70 | # this is completly hacky for now since the runner doesn't have a | 70 | # this is completly hacky for now since the runner doesn't have a | ||
| 71 | # good way to get the actual refurl. This will be addressed in T122 and | 71 | # good way to get the actual refurl. This will be addressed in T122 and | ||
| 72 | # T145 | 72 | # T145 | ||
| 73 | 73 | | |||
| 74 | url = 'http://not-a-real-domain.com/noworky' | 74 | url = 'http://not-a-real-domain.com/noworky' | ||
| 75 | if refurl is not None: | 75 | if refurl is not None: | ||
| 76 | url = refurl | 76 | url = refurl | ||
| 77 | 77 | | |||
| 78 | return self.resultsdb.create_job(url, status='RUNNING', name=name) | 78 | jobdata = self.resultsdb.create_job(url, status='SCHEDULED', name=name) | ||
| 79 | self.resultsdb.update_job(self, id=jobdata['id'], status='RUNNING') | ||||
| 80 | | ||||
| 81 | return jobdata | ||||
| 79 | 82 | | |||
| 80 | def complete_resultsdb_job(self, jobid): | 83 | def complete_resultsdb_job(self, jobid): | ||
| 81 | """ Change the resultsdb job to a status of 'COMPLETED', indicating | 84 | """ Change the resultsdb job to a status of 'COMPLETED', indicating | ||
| 82 | that the reporting is complete. | 85 | that the reporting is complete. | ||
| 83 | 86 | | |||
| 84 | :param int jobid: The resultsdb jobid to be modified | 87 | :param int jobid: The resultsdb jobid to be modified | ||
| 85 | :returns: json representation of returned data from the resultsdb instance | 88 | :returns: json representation of returned data from the resultsdb instance | ||
| 86 | """ | 89 | """ | ||
| ▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines | |||||
| Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Line(s) | 89 | def test_report(self): | |||
|---|---|---|---|---|---|
| 92 | 92 | | |||
| 93 | self.test_rdb.process(self.ref_input, self.ref_envdata) | 93 | self.test_rdb.process(self.ref_input, self.ref_envdata) | ||
| 94 | 94 | | |||
| 95 | # Given the input data, the resultsdb should be called once, and only | 95 | # Given the input data, the resultsdb should be called once, and only | ||
| 96 | # once, calling "create_result". | 96 | # once, calling "create_result". | ||
| 97 | # This assert failing either means that more calls were added in the | 97 | # This assert failing either means that more calls were added in the | ||
| 98 | # source code, or that a bug is present, and "create_result" is | 98 | # source code, or that a bug is present, and "create_result" is | ||
| 99 | # called multiple times. | 99 | # called multiple times. | ||
| 100 | # we expect rdb to be called 4 times: create job, check for testcase, | 100 | # we expect rdb to be called 4 times: create job, update to RUNNING, | ||
| 101 | # report result and complete job | 101 | # check for testcase, report result and complete job | ||
| 102 | 102 | | |||
| 103 | assert len(self.stub_rdb.calls()) == 4 | 103 | assert len(self.stub_rdb.calls()) == 5 | ||
| 104 | 104 | | |||
| 105 | # Select the first call of "create_result" method. | 105 | # Select the first call of "create_result" method. | ||
| 106 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | 106 | # This could be written as self.stub_rdb.calls()[0] at the moment, but | ||
| 107 | # this is more future-proof, and accidental addition of resultsdb | 107 | # this is more future-proof, and accidental addition of resultsdb | ||
| 108 | # calls is handled by the previous assert. | 108 | # calls is handled by the previous assert. | ||
| 109 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | 109 | call = [call for call in self.stub_rdb.calls() if call[0] == 'create_result'][0] | ||
| 110 | # Select the keyword arguments of that call | 110 | # Select the keyword arguments of that call | ||
| 111 | call_data = call[2] | 111 | call_data = call[2] | ||
| Show All 15 Lines | 126 | def test_create_job(self): | |||
| 127 | # make sure that the proper API calls are made to create a resultsdb job | 127 | # make sure that the proper API calls are made to create a resultsdb job | ||
| 128 | test_jobdata = self.test_rdb.create_resultsdb_job(self.ref_envdata['checkname'], | 128 | test_jobdata = self.test_rdb.create_resultsdb_job(self.ref_envdata['checkname'], | ||
| 129 | self.ref_refurl) | 129 | self.ref_refurl) | ||
| 130 | 130 | | |||
| 131 | assert test_jobdata == self.ref_jobdata | 131 | assert test_jobdata == self.ref_jobdata | ||
| 132 | 132 | | |||
| 133 | rdb_calls = self.stub_rdb.calls() | 133 | rdb_calls = self.stub_rdb.calls() | ||
| 134 | # we expect only one call to resultsdb when creating a job | 134 | # we expect only one call to resultsdb when creating a job | ||
| 135 | assert len(rdb_calls) == 1 | 135 | assert len(rdb_calls) == 2 | ||
| 136 | assert rdb_calls[0][0] == 'create_job' | 136 | assert rdb_calls[0][0] == 'create_job' | ||
| 137 | assert rdb_calls[1][0] == 'update_job' | ||||
| 137 | 138 | | |||
| 138 | def test_complete_job(self): | 139 | def test_complete_job(self): | ||
| 139 | # make sure that the proper API calls are made to complete the job | 140 | # make sure that the proper API calls are made to complete the job | ||
| 140 | self.test_rdb.complete_resultsdb_job(self.ref_jobid) | 141 | self.test_rdb.complete_resultsdb_job(self.ref_jobid) | ||
| 141 | 142 | | |||
| 142 | rdb_calls = self.stub_rdb.calls() | 143 | rdb_calls = self.stub_rdb.calls() | ||
| 143 | # we expect only one call to resultsdb when completing a job | 144 | # we expect only one call to resultsdb when completing a job | ||
| 144 | assert len(rdb_calls) == 1 | 145 | assert len(rdb_calls) == 1 | ||
| Show All 28 Lines | |||||