[PATCH 1 of 8 py3] dispatch: consolidate formatting of arguments

Kevin Bullock kbullock+mercurial at ringworld.org
Tue Mar 21 22:11:57 EDT 2017


> On Mar 19, 2017, at 03:24, Pulkit Goyal <7895pulkit at gmail.com> wrote:
> 
> On Sun, Mar 19, 2017 at 11:43 AM, Augie Fackler <raf at durin42.com> wrote:
> 
> > On Mar 19, 2017, at 2:11 AM, Augie Fackler <raf at durin42.com> wrote:
> >
> > # HG changeset patch
> > # User Augie Fackler <augie at google.com>
> > # Date 1489897133 14400
> > #      Sun Mar 19 00:18:53 2017 -0400
> > # Node ID ea399732bc91813286b8f40082ec33a6a16b3558
> > # Parent  291951ad070b3fa39dd1d83503aa1011a20d9a21
> > dispatch: consolidate formatting of arguments
> 
> These 8 are the first round of almost 30 patches that get `hg commit` working as long as it doesn’t need to compute a delta (bdiff.py appears to be sad on Python 3, but I’m up waaaay later than I meant to be already...) 
> 
> ​Since we have a number of commands running, what's up with the Python 3 buildbot. That will help us not to break things which we already fixed.​ 

I bombed patches to mercurial-infrastructure at or shortly after the sprint. I need someone (Augie?) to verify that it'll run tests the right way:

diff --git a/builderbuilder.py b/builderbuilder.py
--- a/builderbuilder.py
+++ b/builderbuilder.py
@@ -52,6 +52,28 @@ def hgpysteps(pyversion, runtestsopts=[]
     return steps


+def hgpy3steps(make='make'):
+    testdesc = 'run-tests.py (python3)'
+    return [
+        Compile(command=[make, 'clean'],
+                name='make clean',
+                description='make clean',
+                descriptionDone='make clean'),
+        runteststep(command=['python', 'run-tests.py', '-j',
+                             Property('jobs', default='1'),
+                             '-t', Property('timeout', default='180'),
+                             WithProperties('--blacklist=%(blacklist:-/dev/null
)s'),
+                             'test-check-py3-commands.t'],
+                    workdir='build/tests',
+                    env={'TMPDIR': Property('tmpdir'),
+                         'PYTHONHASHSEED': Property('pythonhashseed'),
+                         'PYENV_VERSION': '2.7.10',
+                         'PYTHON3': '/srv/buildbot/.pyenv/versions/3.6.0/bin/py
thon',
+                         'HGTEST_PORT': Property('hgstartport', default='')},
+                    name=testdesc, description=testdesc, descriptionDone=testde
sc),
+    ]
+
+
 def hgperfsteps():
     env = {
         "PYENV_VERSION": "2.7.10",

To simplify that a bit, it's essentially running:

    $ PYTHON3=/path/to/python3 python run-tests.py test-check-py3-commands.t

where `python` is 2.7.x and `python3` is 3.6.0.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list