Created attachment 87034 [details] [review]
stop using RequestHandles() for contacts

Created attachment 87035 [details] [review]
remove roster/ensure.py

Created attachment 87036 [details] [review]
stop using RequestHandles() to create room channel

Created attachment 87037 [details] [review]
join_muc_and_check: stop returning the muc handle

Created attachment 87038 [details] [review]
tube tests: make sure to catch the right MUC presence stanza

Created attachment 87039 [details] [review]
join_muc: stop returning the muc handle

Created attachment 87040 [details] [review]
remove rostertest.py

Created attachment 87041 [details] [review]
remove request-group-{after,before}-roster.py

With those patches, tests stop using RequestHandles().

They can already be reviewed/merged (master and/or next); I'll continue doing more cleaning.

looking

all good so far

Everything ok for master?

(In reply to comment #12)
> Everything ok for master?

Everything I've seen here is fine for master, yes.

Everything merged to master. I'll keep this bug open.

Created attachment 87107 [details] [review]
test-roster-subscribe: stop testing old API

Created attachment 87108 [details] [review]
stop using NewChannel signal in tests

Created attachment 87111 [details] [review]
s/NUM_TP/TP_NUM

Created attachment 87112 [details] [review]
Stop using TpTubeType enum

Comment on attachment 87107 [details] [review]
test-roster-subscribe: stop testing old API

Review of attachment 87107 [details] [review]:
-----------------------------------------------------------------

Possibly wrong, but not a regression:

::: tests/twisted/roster/test-roster-subscribe.py
@@ +19,3 @@
>  
>  def test_modern_reject(q, bus, conn, stream):
> +    test(q, bus, conn, stream, 'reject')

It looks as though this should maybe have said (... stream, True, False, 'reject')? Does it still pass if you change it to  (... stream, False, 'reject')?

(In reply to comment #19)
> Comment on attachment 87107 [details] [review] [review]
> test-roster-subscribe: stop testing old API
> 
> Review of attachment 87107 [details] [review] [review]:
> -----------------------------------------------------------------
> 
> Possibly wrong, but not a regression:
> 
> ::: tests/twisted/roster/test-roster-subscribe.py
> @@ +19,3 @@
> >  
> >  def test_modern_reject(q, bus, conn, stream):
> > +    test(q, bus, conn, stream, 'reject')
> 
> It looks as though this should maybe have said (... stream, True, False,
> 'reject')? Does it still pass if you change it to  (... stream, False,
> 'reject')?

It does.
But changing:

def test_modern_revoke(q, bus, conn, stream):
-    test(q, bus, conn, stream, 'revoke')
+    test(q, bus, conn, stream, False, 'revoke')

doesn't pass.

(In reply to comment #20)
> It does.

Please do, then.

> But changing:
> 
> def test_modern_revoke(q, bus, conn, stream):
> -    test(q, bus, conn, stream, 'revoke')
> +    test(q, bus, conn, stream, False, 'revoke')
> 
> doesn't pass.

Clone a bug, move on?

(In reply to comment #21)
> (In reply to comment #20)
> > It does.
> 
> Please do, then.
> 
> > But changing:
> > 
> > def test_modern_revoke(q, bus, conn, stream):
> > -    test(q, bus, conn, stream, 'revoke')
> > +    test(q, bus, conn, stream, False, 'revoke')
> > 
> > doesn't pass.
> 
> Clone a bug, move on?

Opened bug #70139

Patches merged to master.

More patches preparing the 'next' branch but we can already merged to master:
http://cgit.collabora.com/git/user/cassidy/telepathy-gabble/log/?h=pre-next

Merged to master.