tests/mockmakedate.py

merge: make mergeresult constructor initialize empty object

In future patches, we will be going to update mergeresult object
instead of building an actions dict and then setting it in the object.

Differential Revision: https://phab.mercurial-scm.org/D8819

# mock out util.makedate() to supply testable values

from __future__ import absolute_import

import os

from mercurial import pycompat
from mercurial.utils import dateutil


def mockmakedate():
    filename = os.path.join(os.environ['TESTTMP'], 'testtime')
    try:
        with open(filename, 'rb') as timef:
            time = float(timef.read()) + 1
    except IOError:
        time = 0.0
    with open(filename, 'wb') as timef:
        timef.write(pycompat.bytestr(time))
    return (time, 0)


dateutil.makedate = mockmakedate