This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3506

tests: port test-filecache.py to Python 3
ClosedPublic

Authored by durin42 on May 8 2018, 3:27 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb3ffa2faae04: tests: port test-filecache.py to Python 3
Summary

Only remarkable bit is my wrapper around print(), which I regret a
little, but not enough to go back and try to do something cleaner.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.May 8 2018, 3:27 PM
indygreg accepted this revision.May 8 2018, 4:19 PM
This revision is now accepted and ready to land.May 8 2018, 4:19 PM
Closed by commit rHGb3ffa2faae04: tests: port test-filecache.py to Python 3 (authored by durin42). · Explain WhyMay 8 2018, 4:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-filecache.py (32 lines)

Diff 8582

contrib/python3-whitelist

test-exchange-obsmarkers-case-D3.t test-exchange-obsmarkers-case-D3.t
test-exchange-obsmarkers-case-D4.t test-exchange-obsmarkers-case-D4.t
test-execute-bit.t test-execute-bit.t
test-export.t test-export.t
test-extdata.t test-extdata.t
test-extdiff.t test-extdiff.t
test-extra-filelog-entry.t test-extra-filelog-entry.t
test-filebranch.t test-filebranch.t
test-filecache.py
test-fileset-generated.t test-fileset-generated.t
test-fix-topology.t test-fix-topology.t
test-flags.t test-flags.t
test-generaldelta.t test-generaldelta.t
test-getbundle.t test-getbundle.t
test-git-export.t test-git-export.t
test-glog-topological.t test-glog-topological.t
test-gpg.t test-gpg.t

tests/test-filecache.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import os import os
import stat import stat
import subprocess import subprocess
import sys import sys
if subprocess.call(['python', '%s/hghave' % os.environ['TESTDIR'], if subprocess.call(['python', '%s/hghave' % os.environ['TESTDIR'],
'cacheable']): 'cacheable']):
sys.exit(80) sys.exit(80)
print_ = print
def print(*args, **kwargs):
"""print() wrapper that flushes stdout buffers to avoid py3 buffer issues
We could also just write directly to sys.stdout.buffer the way the
ui object will, but this was easier for porting the test.
"""
print_(*args, **kwargs)
sys.stdout.flush()
from mercurial import ( from mercurial import (
extensions, extensions,
hg, hg,
localrepo, localrepo,
pycompat, pycompat,
ui as uimod, ui as uimod,
util, util,
vfs as vfsmod, vfs as vfsmod,
@localrepo.repofilecache('x', 'y') @localrepo.repofilecache('x', 'y')
def cached(self): def cached(self):
print('creating') print('creating')
return 'string from function' return 'string from function'
def invalidate(self): def invalidate(self):
for k in self._filecache: for k in self._filecache:
try: try:
delattr(self, k) delattr(self, pycompat.sysstr(k))
except AttributeError: except AttributeError:
pass pass
def basic(repo): def basic(repo):
print("* neither file exists") print("* neither file exists")
# calls function # calls function
repo.cached repo.cached
repo.invalidate() repo.invalidate()
print("* nothing changed with either file") print("* nothing changed with either file")
# stats file again, reuses object # stats file again, reuses object
repo.cached repo.cached
# atomic replace file, size doesn't change # atomic replace file, size doesn't change
# hopefully st_mtime doesn't change as well so this doesn't use the cache # hopefully st_mtime doesn't change as well so this doesn't use the cache
# because of inode change # because of inode change
f = vfsmod.vfs('.')('x', 'w', atomictemp=True) f = vfsmod.vfs(b'.')(b'x', b'w', atomictemp=True)
f.write('b') f.write(b'b')
f.close() f.close()
repo.invalidate() repo.invalidate()
print("* file x changed inode") print("* file x changed inode")
repo.cached repo.cached
# create empty file y # create empty file y
f = open('y', 'w') f = open('y', 'w')
f.close() f.close()
repo.invalidate() repo.invalidate()
print("* empty file y created") print("* empty file y created")
# should recreate the object # should recreate the object
repo.cached repo.cached
f = open('y', 'w') f = open('y', 'w')
f.write('A') f.write('A')
f.close() f.close()
repo.invalidate() repo.invalidate()
print("* file y changed size") print("* file y changed size")
# should recreate the object # should recreate the object
repo.cached repo.cached
f = vfsmod.vfs('.')('y', 'w', atomictemp=True) f = vfsmod.vfs(b'.')(b'y', b'w', atomictemp=True)
f.write('B') f.write(b'B')
f.close() f.close()
repo.invalidate() repo.invalidate()
print("* file y changed inode") print("* file y changed inode")
repo.cached repo.cached
f = vfsmod.vfs('.')('x', 'w', atomictemp=True) f = vfsmod.vfs(b'.')(b'x', b'w', atomictemp=True)
f.write('c') f.write(b'c')
f.close() f.close()
f = vfsmod.vfs('.')('y', 'w', atomictemp=True) f = vfsmod.vfs(b'.')(b'y', b'w', atomictemp=True)
f.write('C') f.write(b'C')
f.close() f.close()
repo.invalidate() repo.invalidate()
print("* both files changed inode") print("* both files changed inode")
repo.cached repo.cached
def fakeuncacheable(): def fakeuncacheable():
def wrapcacheable(orig, *args, **kwargs): def wrapcacheable(orig, *args, **kwargs):
util.cachestat.__init__ = originit util.cachestat.__init__ = originit
def test_filecache_synced(): def test_filecache_synced():
# test old behavior that caused filecached properties to go out of sync # test old behavior that caused filecached properties to go out of sync
os.system('hg init && echo a >> a && hg ci -qAm.') os.system('hg init && echo a >> a && hg ci -qAm.')
repo = hg.repository(uimod.ui.load()) repo = hg.repository(uimod.ui.load())
# first rollback clears the filecache, but changelog to stays in __dict__ # first rollback clears the filecache, but changelog to stays in __dict__
repo.rollback() repo.rollback()
repo.commit('.') repo.commit(b'.')
# second rollback comes along and touches the changelog externally # second rollback comes along and touches the changelog externally
# (file is moved) # (file is moved)
repo.rollback() repo.rollback()
# but since changelog isn't under the filecache control anymore, we don't # but since changelog isn't under the filecache control anymore, we don't
# see that it changed, and return the old changelog without reconstructing # see that it changed, and return the old changelog without reconstructing
# it # it
repo.commit('.') repo.commit(b'.')
def setbeforeget(repo): def setbeforeget(repo):
os.remove('x') os.remove('x')
os.remove('y') os.remove('y')
repo.cached = 'string set externally' repo.cached = 'string set externally'
repo.invalidate() repo.invalidate()
print("* neither file exists") print("* neither file exists")
print(repo.cached) print(repo.cached)