Skip to content

Commit

Permalink
Strip out datetime subseconds more than ms from spec tests
Browse files Browse the repository at this point in the history
Since that's optional behaviour.

Fixes #155
  • Loading branch information
arp242 committed May 23, 2024
1 parent 85b53eb commit 88ec5ad
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 24 deletions.
4 changes: 4 additions & 0 deletions gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ def write_invalid_case(header, index, block):
path.write_text(block.strip() + '\n')

def write_valid_case(decoder, header, index, block):
# Strip out datetime subseconds more than ms, since that's optional
# behaviour.
block = re.sub(r'(:\d\d)\.9999+', r'\1.999', block)

path = VALID_ROOT / f"{header}-{index}.toml"
path.parent.mkdir(parents=True, exist_ok=True)
path.write_text(block.strip() + '\n')
Expand Down
23 changes: 14 additions & 9 deletions tests/files-toml-1.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ invalid/datetime/no-leads-month.toml
invalid/datetime/no-leads-with-milli.toml
invalid/datetime/no-secs.toml
invalid/datetime/no-t.toml
invalid/datetime/offset-overflow-hour.toml
invalid/datetime/offset-overflow-minute.toml
invalid/datetime/second-over.toml
invalid/datetime/time-no-leads.toml
invalid/datetime/y10k.toml
Expand Down Expand Up @@ -152,15 +154,16 @@ invalid/inline-table/no-close-1.toml
invalid/inline-table/no-close-2.toml
invalid/inline-table/no-comma-1.toml
invalid/inline-table/no-comma-2.toml
invalid/inline-table/overwrite-1.toml
invalid/inline-table/overwrite-2.toml
invalid/inline-table/overwrite-3.toml
invalid/inline-table/overwrite-4.toml
invalid/inline-table/overwrite-5.toml
invalid/inline-table/overwrite-6.toml
invalid/inline-table/overwrite-7.toml
invalid/inline-table/overwrite-8.toml
invalid/inline-table/overwrite-9.toml
invalid/inline-table/overwrite-01.toml
invalid/inline-table/overwrite-02.toml
invalid/inline-table/overwrite-03.toml
invalid/inline-table/overwrite-04.toml
invalid/inline-table/overwrite-05.toml
invalid/inline-table/overwrite-06.toml
invalid/inline-table/overwrite-07.toml
invalid/inline-table/overwrite-08.toml
invalid/inline-table/overwrite-09.toml
invalid/inline-table/overwrite-10.toml
invalid/inline-table/trailing-comma.toml
invalid/integer/capital-bin.toml
invalid/integer/capital-hex.toml
Expand Down Expand Up @@ -680,6 +683,8 @@ valid/string/raw-multiline.json
valid/string/raw-multiline.toml
valid/string/simple.json
valid/string/simple.toml
valid/string/start-mb.json
valid/string/start-mb.toml
valid/string/unicode-escape.json
valid/string/unicode-escape.toml
valid/string/unicode-literal.json
Expand Down
23 changes: 14 additions & 9 deletions tests/files-toml-1.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ invalid/datetime/no-leads.toml
invalid/datetime/no-leads-month.toml
invalid/datetime/no-leads-with-milli.toml
invalid/datetime/no-t.toml
invalid/datetime/offset-overflow-hour.toml
invalid/datetime/offset-overflow-minute.toml
invalid/datetime/second-over.toml
invalid/datetime/time-no-leads.toml
invalid/datetime/y10k.toml
Expand Down Expand Up @@ -147,15 +149,16 @@ invalid/inline-table/no-close-1.toml
invalid/inline-table/no-close-2.toml
invalid/inline-table/no-comma-1.toml
invalid/inline-table/no-comma-2.toml
invalid/inline-table/overwrite-1.toml
invalid/inline-table/overwrite-2.toml
invalid/inline-table/overwrite-3.toml
invalid/inline-table/overwrite-4.toml
invalid/inline-table/overwrite-5.toml
invalid/inline-table/overwrite-6.toml
invalid/inline-table/overwrite-7.toml
invalid/inline-table/overwrite-8.toml
invalid/inline-table/overwrite-9.toml
invalid/inline-table/overwrite-01.toml
invalid/inline-table/overwrite-02.toml
invalid/inline-table/overwrite-03.toml
invalid/inline-table/overwrite-04.toml
invalid/inline-table/overwrite-05.toml
invalid/inline-table/overwrite-06.toml
invalid/inline-table/overwrite-07.toml
invalid/inline-table/overwrite-08.toml
invalid/inline-table/overwrite-09.toml
invalid/inline-table/overwrite-10.toml
invalid/integer/capital-bin.toml
invalid/integer/capital-hex.toml
invalid/integer/capital-oct.toml
Expand Down Expand Up @@ -680,6 +683,8 @@ valid/string/raw-multiline.json
valid/string/raw-multiline.toml
valid/string/simple.json
valid/string/simple.toml
valid/string/start-mb.json
valid/string/start-mb.toml
valid/string/unicode-escape.json
valid/string/unicode-escape.toml
valid/string/unicode-literal.json
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/spec/local-date-time-0.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
},
"ldt2": {
"type": "datetime-local",
"value": "1979-05-27T00:32:00.999999"
"value": "1979-05-27T00:32:00.999"
}
}
2 changes: 1 addition & 1 deletion tests/valid/spec/local-date-time-0.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ldt1 = 1979-05-27T07:32:00
ldt2 = 1979-05-27T00:32:00.999999
ldt2 = 1979-05-27T00:32:00.999
2 changes: 1 addition & 1 deletion tests/valid/spec/local-time-0.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
},
"lt2": {
"type": "time-local",
"value": "00:32:00.999999"
"value": "00:32:00.999"
}
}
2 changes: 1 addition & 1 deletion tests/valid/spec/local-time-0.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
lt1 = 07:32:00
lt2 = 00:32:00.999999
lt2 = 00:32:00.999
2 changes: 1 addition & 1 deletion tests/valid/spec/offset-date-time-0.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"odt3": {
"type": "datetime",
"value": "1979-05-27T00:32:00.999999-07:00"
"value": "1979-05-27T00:32:00.999-07:00"
}
}
2 changes: 1 addition & 1 deletion tests/valid/spec/offset-date-time-0.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
odt1 = 1979-05-27T07:32:00Z
odt2 = 1979-05-27T00:32:00-07:00
odt3 = 1979-05-27T00:32:00.999999-07:00
odt3 = 1979-05-27T00:32:00.999-07:00

0 comments on commit 88ec5ad

Please sign in to comment.