Skip to content

Commit 57a8ff4

Browse files
committed
Address feedback for Subprojects capability
Fixed typos and addressed concerns about wording.
1 parent 50089d9 commit 57a8ff4

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/_canary/plugins/builtin/cdash/xml_generator.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,17 @@ def generate_buildstamp(self, track):
128128
return time.strftime(fmt, t)
129129

130130
def validate_buildstamp(self, buildstamp):
131-
match = re.match(r"(\d{8}-\d{4})-[^ ]*", buildstamp)
131+
match = re.match(r"(\d{8}-\d{4})-[^ ].*", buildstamp)
132132
if match:
133133
time_part = match.group(1)
134134
fmt = "%Y%m%d-%H%M"
135135
try:
136136
time.strptime(time_part, fmt)
137137
except ValueError:
138-
raise ValueError(f"expected build stamp time part should be formatted as {fmt!r}, got {time_part}")
138+
raise ValueError(f"expected build stamp time formatting: {fmt!r}, got {time_part}")
139139
return buildstamp
140140
else:
141-
raise ValueError(f"expected build stamp should match the format 'YYYYMMDD-HHMM-Track [optional description]', got {buildstamp}")
141+
raise ValueError(f"expected build stamp should match the format 'YYYYMMDD-HHMM-Track', got {buildstamp}")
142142

143143
@staticmethod
144144
def post(url: str, project: str, *files: str, done: bool = False) -> str | None:
@@ -224,7 +224,6 @@ def write_test_xml(
224224
doc = self.create_document()
225225
root = doc.firstChild
226226

227-
#ToDo: add an argument for the subproject labels being found from tests
228227
if use_labels:
229228
project_labesls = set()
230229
for case in cases:

src/_canary/testcase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ def keywords(self, arg: list[str]) -> None:
574574

575575
@property
576576
def subproject_labels(self) -> list[str] | None:
577-
"""Test keywords (labels)"""
577+
"""Test subproject labels"""
578578
return self._subproject_labels
579579

580580
@subproject_labels.setter

0 commit comments

Comments
 (0)