| Submitter | Matt Harbison |
|---|---|
| Date | Jan. 17, 2019, 5:20 a.m. |
| Message ID | <4b4a6ca03f04601ea00e.1547702448@Envy> |
| Download | mbox | patch |
| Permalink | /patch/37846/ |
| State | Accepted |
| Headers | show |
Comments
queued thanks > On Jan 17, 2019, at 06:20, Matt Harbison <mharbison72@gmail.com> wrote: > > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1547693656 18000 > # Wed Jan 16 21:54:16 2019 -0500 > # Node ID 4b4a6ca03f04601ea00e6028cbc96882c161e142 > # Parent 73b630278375d51137772d30fa93f9fe009441de > tests: also skip remotefilelog *.py tests on Windows > > Otherwise, the buildbot won't even be green on stable with the RC. This should > have gone with 0800d9e6e216. Previous discussion in this thread: > > https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-November/125421.html > > diff --git a/tests/test-remotefilelog-datapack.py b/tests/test-remotefilelog-datapack.py > --- a/tests/test-remotefilelog-datapack.py > +++ b/tests/test-remotefilelog-datapack.py > @@ -18,6 +18,7 @@ import silenttestrunner > sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')] > from mercurial.node import nullid > from mercurial import ( > + pycompat, > ui as uimod, > ) > from hgext.remotefilelog import ( > @@ -372,4 +373,6 @@ class datapacktests(datapacktestsbase, u > # - GC two packs into one > > if __name__ == '__main__': > + if pycompat.iswindows: > + sys.exit(80) # Skip on Windows > silenttestrunner.main(__name__) > diff --git a/tests/test-remotefilelog-histpack.py b/tests/test-remotefilelog-histpack.py > --- a/tests/test-remotefilelog-histpack.py > +++ b/tests/test-remotefilelog-histpack.py > @@ -273,4 +273,6 @@ class histpacktests(unittest.TestCase): > # - repack two packs into one > > if __name__ == '__main__': > + if pycompat.iswindows: > + sys.exit(80) # Skip on Windows > silenttestrunner.main(__name__)
Patch
diff --git a/tests/test-remotefilelog-datapack.py b/tests/test-remotefilelog-datapack.py --- a/tests/test-remotefilelog-datapack.py +++ b/tests/test-remotefilelog-datapack.py @@ -18,6 +18,7 @@ import silenttestrunner sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')] from mercurial.node import nullid from mercurial import ( + pycompat, ui as uimod, ) from hgext.remotefilelog import ( @@ -372,4 +373,6 @@ class datapacktests(datapacktestsbase, u # - GC two packs into one if __name__ == '__main__': + if pycompat.iswindows: + sys.exit(80) # Skip on Windows silenttestrunner.main(__name__) diff --git a/tests/test-remotefilelog-histpack.py b/tests/test-remotefilelog-histpack.py --- a/tests/test-remotefilelog-histpack.py +++ b/tests/test-remotefilelog-histpack.py @@ -273,4 +273,6 @@ class histpacktests(unittest.TestCase): # - repack two packs into one if __name__ == '__main__': + if pycompat.iswindows: + sys.exit(80) # Skip on Windows silenttestrunner.main(__name__)