| Submitter | Mads Kiilerich |
|---|---|
| Date | Aug. 26, 2014, 8:04 p.m. |
| Message ID | <e36b6ce43abd98c7f3ae.1409083441@mk-desktop> |
| Download | mbox | patch |
| Permalink | /patch/5601/ |
| State | Accepted |
| Headers | show |
Comments
On Tue, Aug 26, 2014 at 10:04:01PM +0200, Mads Kiilerich wrote: > # HG changeset patch > # User Mads Kiilerich <madski@unity3d.com> > # Date 1409083410 -7200 > # Tue Aug 26 22:03:30 2014 +0200 > # Node ID e36b6ce43abd98c7f3aec9763f5964b35c782354 > # Parent d52df16804a9d6e58fc20b44853468986eecc152 > run-tests: report skipped tests as "skipped" - they might still be "relevant" Queued this one, will look at the (wholly unrelated) remainder of the series later. > > diff --git a/tests/run-tests.py b/tests/run-tests.py > --- a/tests/run-tests.py > +++ b/tests/run-tests.py > @@ -546,7 +546,7 @@ class Test(unittest.TestCase): > missing, failed = TTest.parsehghaveoutput(out) > > if not missing: > - missing = ['irrelevant'] > + missing = ['skipped'] > > if failed: > self.fail('hg have failed checking for %s' % failed[-1]) > diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t > --- a/tests/test-run-tests.t > +++ b/tests/test-run-tests.t > @@ -325,7 +325,7 @@ Skips > > EOF > $ $TESTDIR/run-tests.py --with-hg=`which hg` --nodiff > !.s > - Skipped test-skip.t: irrelevant > + Skipped test-skip.t: skipped > Failed test-failure.t: output changed > # Ran 2 tests, 1 skipped, 0 warned, 1 failed. > python hash seed: * (glob) > @@ -333,14 +333,14 @@ Skips > > $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy > .s > - Skipped test-skip.t: irrelevant > + Skipped test-skip.t: skipped > # Ran 2 tests, 2 skipped, 0 warned, 0 failed. > > Skips with xml > $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \ > > --xunit=xunit.xml > .s > - Skipped test-skip.t: irrelevant > + Skipped test-skip.t: skipped > # Ran 2 tests, 2 skipped, 0 warned, 0 failed. > $ cat xunit.xml > <?xml version="1.0" encoding="utf-8"?> > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > http://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -546,7 +546,7 @@ class Test(unittest.TestCase): missing, failed = TTest.parsehghaveoutput(out) if not missing: - missing = ['irrelevant'] + missing = ['skipped'] if failed: self.fail('hg have failed checking for %s' % failed[-1]) diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t --- a/tests/test-run-tests.t +++ b/tests/test-run-tests.t @@ -325,7 +325,7 @@ Skips > EOF $ $TESTDIR/run-tests.py --with-hg=`which hg` --nodiff !.s - Skipped test-skip.t: irrelevant + Skipped test-skip.t: skipped Failed test-failure.t: output changed # Ran 2 tests, 1 skipped, 0 warned, 1 failed. python hash seed: * (glob) @@ -333,14 +333,14 @@ Skips $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy .s - Skipped test-skip.t: irrelevant + Skipped test-skip.t: skipped # Ran 2 tests, 2 skipped, 0 warned, 0 failed. Skips with xml $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \ > --xunit=xunit.xml .s - Skipped test-skip.t: irrelevant + Skipped test-skip.t: skipped # Ran 2 tests, 2 skipped, 0 warned, 0 failed. $ cat xunit.xml <?xml version="1.0" encoding="utf-8"?>