Skip to content

Commit 3947d9a

Browse files
committed
src/sage/doctest/control.py: In doctests, only put Python floats in the stats dictionary, not Sage RealNumbers
1 parent 77323e2 commit 3947d9a

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

src/sage/doctest/control.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ def load_stats(self, filename):
720720
sage: import json
721721
sage: filename = tmp_filename()
722722
sage: with open(filename, 'w') as stats_file:
723-
....: json.dump({'sage.doctest.control':{'walltime':1.0r}}, stats_file)
723+
....: json.dump({'sage.doctest.control': {'walltime': 1.0r}}, stats_file)
724724
sage: DC.load_stats(filename)
725725
sage: DC.stats['sage.doctest.control']
726726
{'walltime': 1.0}
@@ -755,7 +755,7 @@ def save_stats(self, filename):
755755
756756
sage: from sage.doctest.control import DocTestDefaults, DocTestController
757757
sage: DC = DocTestController(DocTestDefaults(), [])
758-
sage: DC.stats['sage.doctest.control'] = {'walltime':1.0r}
758+
sage: DC.stats['sage.doctest.control'] = {'walltime': 1.0r}
759759
sage: filename = tmp_filename()
760760
sage: DC.save_stats(filename)
761761
sage: import json
@@ -1030,8 +1030,8 @@ def filter_sources(self):
10301030
sage: DC = DocTestController(DD, [dirname])
10311031
sage: DC.expand_files_into_sources()
10321032
sage: for i, source in enumerate(DC.sources):
1033-
....: DC.stats[source.basename] = {'walltime': 0.1*(i+1)}
1034-
sage: DC.stats['sage.doctest.control'] = {'failed':True,'walltime':1.0}
1033+
....: DC.stats[source.basename] = {'walltime': 0.1r * (i+1)}
1034+
sage: DC.stats['sage.doctest.control'] = {'failed': True, 'walltime': 1.0r}
10351035
sage: DC.filter_sources()
10361036
Only doctesting files that failed last test.
10371037
sage: len(DC.sources)
@@ -1061,7 +1061,7 @@ def sort_sources(self):
10611061
sage: DC.expand_files_into_sources()
10621062
sage: DC.sources.sort(key=lambda s:s.basename)
10631063
sage: for i, source in enumerate(DC.sources):
1064-
....: DC.stats[source.basename] = {'walltime': 0.1*(i+1)}
1064+
....: DC.stats[source.basename] = {'walltime': 0.1r * (i+1)}
10651065
sage: DC.sort_sources()
10661066
Sorting sources by runtime so that slower doctests are run first....
10671067
sage: print("\n".join(source.basename for source in DC.sources))
@@ -1202,7 +1202,7 @@ def cleanup(self, final=True):
12021202
sage: DC.sources.sort(key=lambda s:s.basename)
12031203
12041204
sage: for i, source in enumerate(DC.sources):
1205-
....: DC.stats[source.basename] = {'walltime': 0.1*(i+1)}
1205+
....: DC.stats[source.basename] = {'walltime': 0.1r * (i+1)}
12061206
....:
12071207
12081208
sage: DC.run()

src/sage/doctest/forker.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ def report_success(self, out, test, example, got, *, check_duration=0):
13691369
sage: FDS = FileDocTestSource(filename, DD)
13701370
sage: doctests, extras = FDS.create_doctests(globals())
13711371
sage: ex = doctests[0].examples[0]
1372-
sage: ex.walltime = 0.0
1372+
sage: ex.walltime = 0.0r
13731373
sage: DTR.report_success(sys.stdout.write, doctests[0], ex, '1764')
13741374
ok [0.00 s]
13751375
"""
@@ -1542,8 +1542,8 @@ def report_overtime(self, out, test, example, got, *, check_duration=0):
15421542
sage: FDS = FileDocTestSource(filename, DD)
15431543
sage: doctests, extras = FDS.create_doctests(globals())
15441544
sage: ex = doctests[0].examples[0]
1545-
sage: ex.walltime = 1.23
1546-
sage: DTR.report_overtime(sys.stdout.write, doctests[0], ex, 'BAD ANSWER\n', check_duration=2.34)
1545+
sage: ex.walltime = 1.23r
1546+
sage: DTR.report_overtime(sys.stdout.write, doctests[0], ex, 'BAD ANSWER\n', check_duration=2.34r)
15471547
**********************************************************************
15481548
File ".../sage/doctest/forker.py", line 11, in sage.doctest.forker
15491549
Warning, slow doctest:
@@ -1673,11 +1673,12 @@ def update_results(self, D):
16731673
sage: DTR.run(doctests[0])
16741674
TestResults(failed=0, attempted=4)
16751675
sage: T.stop().annotate(DTR)
1676-
sage: D = DictAsObject({'cputime':[],'walltime':[],'err':None})
1676+
sage: D = DictAsObject({'cputime': [], 'walltime': [], 'err': None})
16771677
sage: DTR.update_results(D)
16781678
0
16791679
sage: sorted(list(D.items()))
1680-
[('cputime', [...]), ('err', None), ('failures', 0), ('tests', 4), ('walltime', [...]), ('walltime_skips', 0)]
1680+
[('cputime', [...]), ('err', None), ('failures', 0), ('tests', 4),
1681+
('walltime', [...]), ('walltime_skips', 0)]
16811682
"""
16821683
for key in ["cputime", "walltime"]:
16831684
if key not in D:

0 commit comments

Comments
 (0)