[05:18] cjwatson: Huh, I thought pocketlint caught all the double equals [05:54] wgrant: As far as I can tell it has no double-equals handling [05:55] Hm./ [05:55] cjwatson: Also what's with the new assertDictEqual that requires rSP? Do we need to exempt some new attrs from checks, or is it just type-checking? [05:56] wgrant: What branch is this in, sorry? [05:56] cjwatson: https://code.launchpad.net/~cjwatson/launchpad/upgrade-testtools/+merge/335395 sorry [06:01] wgrant: Looking harder I'm actually somewhat confused as to how it worked before. unittest.TestCase.assertDictEqual does explicit isinstance checks. [06:02] * cjwatson pdbs [06:03] We didn't monkeypatch in zope_isinstance, did we? [06:04] Doesn't look like it. [06:05] I think it has something to do with our own TestCase.assertIsInstance, but checking why that's no longer used. [06:07] Oh, right [06:08] testtools now prefers unittest2, and that does self.assert_(isinstance(...)) rather than self.assertIsInstance() [06:08] Which is kind of a regression from plain unittest IMO, but at least the impact is small [06:09] Ah, fair enough. [06:10] Ah, but it's fixed in newer unittest2 [06:10] So maybe the right answer is to upgrade that instead [06:10] Aha [06:17] wgrant: Upgrading unittest2 and reverting that change passes the relevant tests; I'll do a full test run, though [06:19] cjwatson: Excellent, thanks. [06:20] (https://hg.python.org/unittest2/rev/071e84843744) [06:21] https://hg.python.org/unittest2/rev/2ce0bdfa3bff may mean we actually have to fix some legacy cruft mind you, but we'll see [06:21] That'll be an unfun diff if so [06:22] If they've actually been removed since, we should probably just add compat methods to our TestCase [06:23] We have a LOT of callsites. [06:23] Oh only about 800, not too bad. [06:24] Oh they actually removed assertEquals and co, oh dear [06:25] That's another 1500 or so [06:26] Been mildly annoying me for about six years, so I might just fix in bulk ... [06:26] I mean completely unreviewable, but [06:27] Indeed, a fine idea. [06:50] No obvious DeprecationWarnings showing up yet, so it may just be general cleanup rather than required for this upgrade [07:58] wgrant: Do you have a non-prod Swift setup? I recall that the last time I tried to set one up I ended up rabbit-holing on it for the better part of a day, and eventually giving up and using Canonistack. [07:59] cjwatson: I do. I can give it a run through [07:59] Mine's mitaka but the API isn't completely different so should be good enough [07:59] That'd be very welcome, thanks [08:01] Have we done similar staging adjustments before? I guess we must have done when deploying this in the first place [08:01] Not since then. [08:02] I've been putting it off for years but I guess we should probably fix it up. [08:21] Oh, in fact unittest2 1.1.0 must be fine - I upgraded it in my twisted-16.5.0 branch. === Guest9392 is now known as skay === necrose99_ is now known as necrose99