Commit7555e11

authored

Merge pull request#3314 from pre-commit/remove-log-info-mock

replace log_info_mock with pytest's caplog

2 parents05e365f +1d2f1c0 commit7555e11Copy full SHA for 7555e11

File tree

-15

lines changed

-15

lines changed

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`importfunctools`
`4`	`4`	`importio`
`5`		`-importlogging`
`6`	`5`	`importos.path`
`7`	`6`	`fromunittestimportmock`
`8`	`7`
`@@ -203,12 +202,6 @@ def store(tempdir_factory):`
`203`	`202`	`yieldStore(os.path.join(tempdir_factory.get(),'.pre-commit'))`
`204`	`203`
`205`	`204`
`206`		`-@pytest.fixture`
`207`		`-deflog_info_mock():`
`208`		`-withmock.patch.object(logging.getLogger('pre_commit'),'info')asmck:`
`209`		`-yieldmck`
`210`		`-`
`211`		`-`
`212`	`205`	`classFixture:`
`213`	`206`	`def__init__(self,stream:io.BytesIO)->None:`
`214`	`207`	`self._stream=stream`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,16 +240,16 @@ def test_unknown_keys(store, caplog):`
`240`	`240`	`assertmsg=='Unexpected key(s) present on local => too-much: foo, hello'`
`241`	`241`
`242`	`242`
`243`		`-deftest_reinstall(tempdir_factory,store,log_info_mock):`
	`243`	`+deftest_reinstall(tempdir_factory,store,caplog):`
`244`	`244`	`path=make_repo(tempdir_factory,'python_hooks_repo')`
`245`	`245`	`config=make_config_from_repo(path)`
`246`	`246`	`_get_hook(config,store,'foo')`
`247`	`247`	`# We print some logging during clone (1) + install (3)`
`248`		`-assertlog_info_mock.call_count==4`
`249`		`-log_info_mock.reset_mock()`
	`248`	`+assertlen(caplog.record_tuples)==4`
	`249`	`+caplog.clear()`
`250`	`250`	`# Reinstall on another run should not trigger another install`
`251`	`251`	`_get_hook(config,store,'foo')`
`252`		`-assertlog_info_mock.call_count==0`
	`252`	`+assertlen(caplog.record_tuples)==0`
`253`	`253`
`254`	`254`
`255`	`255`	`deftest_control_c_control_c_on_install(tempdir_factory,store):`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ def test_store_init(store):`
`65`	`65`	`asserttext_lineinreadme_contents`
`66`	`66`
`67`	`67`
`68`		`-deftest_clone(store,tempdir_factory,log_info_mock):`
	`68`	`+deftest_clone(store,tempdir_factory,caplog):`
`69`	`69`	`path=git_dir(tempdir_factory)`
`70`	`70`	`withcwd(path):`
`71`	`71`	`git_commit()`
`@@ -74,7 +74,7 @@ def test_clone(store, tempdir_factory, log_info_mock):`
`74`	`74`
`75`	`75`	`ret=store.clone(path,rev)`
`76`	`76`	`# Should have printed some stuff`
`77`		`-assertlog_info_mock.call_args_list[0][0][0].startswith(`
	`77`	`+assertcaplog.record_tuples[0][-1].startswith(`
`78`	`78`	`'Initializing environment for ',`
`79`	`79`	`)`
`80`	`80`
`@@ -118,7 +118,7 @@ def test_clone_when_repo_already_exists(store):`
`118`	`118`
`119`	`119`	`deftest_clone_shallow_failure_fallback_to_complete(`
`120`	`120`	`store,tempdir_factory,`
`121`		`-log_info_mock,`
	`121`	`+caplog,`
`122`	`122`	`):`
`123`	`123`	`path=git_dir(tempdir_factory)`
`124`	`124`	`withcwd(path):`
`@@ -134,7 +134,7 @@ def fake_shallow_clone(self, args, *kwargs):`
`134`	`134`	`ret=store.clone(path,rev)`
`135`	`135`
`136`	`136`	`# Should have printed some stuff`
`137`		`-assertlog_info_mock.call_args_list[0][0][0].startswith(`
	`137`	`+assertcaplog.record_tuples[0][-1].startswith(`
`138`	`138`	`'Initializing environment for ',`
`139`	`139`	`)`
`140`	`140`

Comments

(0)