[Python-checkins] [Python-3000] buildbot failure in ppc Debian unstable 3.0

[Trent Nelson]

> > Why not revert these, and I understand there's some way of marking
> > files to not be merged, now?  Please so mark these three files, and
> > when it's working in 2.6 again, we can remove the marks.
>
> Looking at these three, it seems that only
> Lib/test/test_ssl.py is broken.  Could this be the effect of
> Trent's earlier work on port selection in the testing
> framework?  Perhaps working from an earlier revision, and
> checking it in on top of later work?

Ah, no, my commit to trunk's test_ssl.py was definitely the latest (Subversion would have prevented the commit otherwise).  You mentioned in an email somewhere else though that the py3k version of test_ssl.py was far more up to date than the trunk version.  That's the problem.  The trunk version was svnmerge'd over the more-up-to-date version in py3k.

Seems like we should revert r62242 test_ssl.py in py3k, commit that, then copy it back to trunk, manually 3to2 it, then check that in, then block that particular revision.  Then, going forward, if test_ssl.py changes need to be made, make them against trunk, and they'll get picked up in the regular merges to py3k.

Sound like a plan?


        Trent.