Skip to content

Commit e17912f

Browse files
author
Priyadarshini Piramanayagam
committed
fix: resolve comments
1 parent 0338102 commit e17912f

File tree

6 files changed

+16
-49
lines changed

6 files changed

+16
-49
lines changed

docs/getting_started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ TestMonitor API (Results)
260260
Overview
261261
~~~~~~~~
262262

263-
The :class:`.TestMonitorClient` class is the primary entry point of the Result API.
263+
The :class:`.TestMonitorClient` class is the primary entry point of the Results API.
264264

265265
When constructing a :class:`.TestMonitorClient`, you can pass an
266266
:class:`.HttpConfiguration` (like one retrieved from the

examples/result/results.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ def create_some_results():
4848
create_response = create_some_results()
4949

5050
# Get all the results using the continuation token in batches of 100 at a time.
51-
response = client.get_results_paged(take=100, return_count=True)
51+
response = client.get_results(take=100, return_count=True)
5252
all_results = response.results
5353
while response.continuation_token:
54-
response = client.get_results_paged(
54+
response = client.get_results(
5555
take=100, continuation_token=response.continuation_token, return_count=True
5656
)
5757
all_results.extend(response.results)
@@ -63,7 +63,7 @@ def create_some_results():
6363
query_request = QueryResultsRequest(
6464
filter=f'status.statusType="{status_type}"', return_count=True
6565
)
66-
response = client.query_results_paged(query_request)
66+
response = client.query_results(query_request)
6767

6868
# Update the first result that you just created and replace the keywords
6969
updated_result = create_response.results[0]

nisystemlink/clients/testmonitor/_test_monitor_client.py

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def create_results(self, results: List[Result]) -> models.ResultsPartialSuccess:
6767
"results",
6868
args=[Query("continuationToken"), Query("take"), Query("returnCount")],
6969
)
70-
def get_results_paged(
70+
def get_results(
7171
self,
7272
continuation_token: Optional[str] = None,
7373
take: Optional[int] = None,
@@ -106,9 +106,7 @@ def get_result(self, id: str) -> models.Result:
106106
...
107107

108108
@post("query-results")
109-
def query_results_paged(
110-
self, query: models.QueryResultsRequest
111-
) -> models.PagedResults:
109+
def query_results(self, query: models.QueryResultsRequest) -> models.PagedResults:
112110
"""Queries for results that match the filter.
113111
114112
Args:
@@ -142,7 +140,7 @@ def query_result_values(self, query: models.QueryResultValuesRequest) -> List[st
142140
...
143141

144142
@post("update-results", args=[Field("results"), Field("replace")])
145-
def __update_results(
143+
def update_results(
146144
self, results: List[UpdateResultRequest], replace: bool = False
147145
) -> models.ResultsPartialSuccess:
148146
"""Updates a list of results with optional field replacement.
@@ -164,37 +162,6 @@ def __update_results(
164162
"""
165163
...
166164

167-
def update_results(
168-
self,
169-
results: List[UpdateResultRequest],
170-
replace: bool = False,
171-
allow_workspace_update: bool = False,
172-
) -> models.ResultsPartialSuccess:
173-
"""Updates a list of results with optional field replacement.
174-
175-
Args:
176-
`results`: A list of results to update. Results are matched for update by id.
177-
`replace`: Replace the existing fields instead of merging them. Defaults to `False`.
178-
If this is `True`, then `keywords` and `properties` for the result will be
179-
replaced by what is in the `results` provided in this request.
180-
If this is `False`, then the `keywords` and `properties` in this request will
181-
merge with what is already present in the server resource.
182-
`allow_workspace_update`: If this is set to `False`, the `workspace` field will be set to None
183-
before updating.
184-
185-
Returns: A list of updates results, results that failed to update, and errors for
186-
failures.
187-
188-
Raises:
189-
ApiException: if unable to communicate with the ``/nitestmonitor`` Service
190-
or provided an invalid argument.
191-
"""
192-
if not allow_workspace_update:
193-
for result in results:
194-
result.workspace = None
195-
196-
return self.__update_results(results, replace)
197-
198165
@delete("results/{id}")
199166
def delete_result(self, id: str) -> None:
200167
"""Deletes a single result by id.

nisystemlink/clients/testmonitor/models/_result.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class StatusObject(JsonModel):
3535
class Result(JsonModel):
3636
"""Contains information about a result."""
3737

38-
status: StatusObject
38+
status: Optional[StatusObject]
3939
"""The status of the result."""
4040

4141
started_at: Optional[datetime]
@@ -44,7 +44,7 @@ class Result(JsonModel):
4444
updated_at: Optional[datetime]
4545
"""The last time that this result was updated."""
4646

47-
program_name: str
47+
program_name: Optional[str]
4848
"""The name of the program that generated this result."""
4949

5050
id: Optional[str]

nisystemlink/clients/testmonitor/models/_update_result_request.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
class UpdateResultRequest(JsonModel):
99
"""Contains information about a result."""
1010

11-
status: StatusObject
11+
status: Optional[StatusObject]
1212
"""The status of the result."""
1313

1414
started_at: Optional[datetime]
1515
"""The time that the result started."""
1616

17-
program_name: str
17+
program_name: Optional[str]
1818
"""The name of the program that generated this result."""
1919

20-
id: Optional[str]
20+
id: str
2121
"""The globally unique id of the result."""
2222

2323
system_id: Optional[str]

tests/integration/testmonitor/test_testmonitor.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def test__create_single_result_and_get_results__at_least_one_result_exists(
125125
]
126126
create_results(results)
127127

128-
get_response = client.get_results_paged()
128+
get_response = client.get_results()
129129

130130
assert get_response is not None
131131
assert len(get_response.results) >= 1
@@ -145,7 +145,7 @@ def test__create_multiple_results_and_get_results_with_take__only_take_returned(
145145
]
146146
create_results(results)
147147

148-
get_response = client.get_results_paged(take=1)
148+
get_response = client.get_results(take=1)
149149

150150
assert get_response is not None
151151
assert len(get_response.results) == 1
@@ -165,7 +165,7 @@ def test__create_multiple_results_and_get_results_with_count_at_least_one_count(
165165
]
166166
create_results(results)
167167

168-
get_response: PagedResults = client.get_results_paged(return_count=True)
168+
get_response: PagedResults = client.get_results(return_count=True)
169169

170170
assert get_response is not None
171171
assert get_response.total_count is not None and get_response.total_count >= 2
@@ -206,7 +206,7 @@ def test__query_result_by_part_number__matches_expected(
206206
query_request = QueryResultsRequest(
207207
filter=f'partNumber="{part_number}"', return_count=True
208208
)
209-
query_response: PagedResults = client.query_results_paged(query_request)
209+
query_response: PagedResults = client.query_results(query_request)
210210
assert query_response.total_count == 1
211211
assert query_response.results[0].part_number == part_number
212212

0 commit comments

Comments
 (0)