Commit287c559

authored and

committed

bpo-30822: Fix testing of datetime module. (#2530) (#2783)

Only C implementation was tested.

1 parentfff2a21 commit287c559Copy full SHA for 287c559

File tree

+15

-9

lines changed

+15

-9

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2271,7 +2271,8 @@ def _name_from_offset(delta):`
`2271`	`2271`	`_check_tzinfo_arg,_check_tzname,_check_utc_offset,_cmp,_cmperror,`
`2272`	`2272`	`_date_class,_days_before_month,_days_before_year,_days_in_month,`
`2273`	`2273`	`_format_time,_is_leap,_isoweek1monday,_math,_ord2ymd,`
`2274`		`-_time,_time_class,_tzinfo_class,_wrap_strftime,_ymd2ord)`
	`2274`	`+_time,_time_class,_tzinfo_class,_wrap_strftime,_ymd2ord,`
	`2275`	`+_divide_and_round)`
`2275`	`2276`	`# XXX Since import * above excludes names that start with _,`
`2276`	`2277`	`# docstring does not get overwritten. In the future, it may be`
`2277`	`2278`	`# appropriate to maintain a single module level docstring and`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,9 @@ def test_constants(self):`
`61`	`61`	`self.assertEqual(datetime.MAXYEAR,9999)`
`62`	`62`
`63`	`63`	`deftest_name_cleanup(self):`
`64`		`-if'_Fast'notinstr(self):`
`65`		`-return`
	`64`	`+if'_Pure'inself.__class__.__name__:`
	`65`	`+self.skipTest('Only run for Fast C implementation')`
	`66`	`+`
`66`	`67`	`datetime=datetime_module`
`67`	`68`	`names=set(namefornameindir(datetime)`
`68`	`69`	`ifnotname.startswith('__')andnotname.endswith('__'))`
`@@ -72,8 +73,9 @@ def test_name_cleanup(self):`
`72`	`73`	`self.assertEqual(names-allowed,set([]))`
`73`	`74`
`74`	`75`	`deftest_divide_and_round(self):`
`75`		`-if'_Fast'instr(self):`
`76`		`-return`
	`76`	`+if'_Fast'inself.__class__.__name__:`
	`77`	`+self.skipTest('Only run for Pure Python implementation')`
	`78`	`+`
`77`	`79`	`dar=datetime_module._divide_and_round`
`78`	`80`
`79`	`81`	`self.assertEqual(dar(-10,-3),3)`
`@@ -2851,7 +2853,7 @@ def tzname(self, dt): return self.tz`
`2851`	`2853`	`self.assertRaises(TypeError,t.strftime,"%Z")`
`2852`	`2854`
`2853`	`2855`	`# Issue #6697:`
`2854`		`-if'_Fast'instr(self):`
	`2856`	`+if'_Fast'inself.__class__.__name__:`
`2855`	`2857`	`Badtzname.tz='\ud800'`
`2856`	`2858`	`self.assertRaises(ValueError,t.strftime,"%Z")`
`2857`	`2859`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`# XXX(gb) First run all the _Pure tests, then all the _Fast tests. You might`
`21`	`21`	`# not believe this, but in spite of all the sys.modules trickery running a _Pure`
`22`	`22`	`# test last will leave a mix of pure and native datetime stuff lying around.`
`23`		`-test_classes= []`
	`23`	`+all_test_classes= []`
`24`	`24`
`25`	`25`	`formodule,suffixinzip(test_modules,test_suffixes):`
`26`	`26`	`test_classes= []`
`@@ -34,7 +34,8 @@`
`34`	`34`	`test_classes.extend(type(test)fortestinsuit)`
`35`	`35`	`test_classes=sorted(set(test_classes),key=lambdacls:cls.__qualname__)`
`36`	`36`	`forclsintest_classes:`
`37`		`-cls.__name__=name+suffix`
	`37`	`+cls.__name__+=suffix`
	`38`	`+cls.__qualname__+=suffix`
`38`	`39`	`@classmethod`
`39`	`40`	`defsetUpClass(cls_,module=module):`
`40`	`41`	`cls_._save_sys_modules=sys.modules.copy()`
`@@ -47,9 +48,10 @@ def tearDownClass(cls_):`
`47`	`48`	`sys.modules.update(cls_._save_sys_modules)`
`48`	`49`	`cls.setUpClass=setUpClass`
`49`	`50`	`cls.tearDownClass=tearDownClass`
	`51`	`+all_test_classes.extend(test_classes)`
`50`	`52`
`51`	`53`	`deftest_main():`
`52`		`-run_unittest(*test_classes)`
	`54`	`+run_unittest(*all_test_classes)`
`53`	`55`
`54`	`56`	`if__name__=="__main__":`
`55`	`57`	`test_main()`

Lines changed: 1 addition & 0 deletions

Comments

(0)