Bug 69854 - unify the 'next' version of constants, servicetest
Summary: unify the 'next' version of constants, servicetest
Status: RESOLVED FIXED
Alias: None
Product: Telepathy
Classification: Unclassified
Component: general (show other bugs)
Version: git master
Hardware: Other All
: medium normal
Assignee: Simon McVittie
QA Contact: Telepathy bugs list
URL:
Whiteboard:
Keywords:
Depends on: 69822 69855 69856
Blocks: 69431
  Show dependency treegraph
 
Reported: 2013-09-26 17:32 UTC by Simon McVittie
Modified: 2013-09-27 14:07 UTC (History)
0 users

See Also:
i915 platform:
i915 features:


Attachments
[mc/next] constants, servicetest: update to Telepathy 1 (13.04 KB, patch)
2013-09-26 18:35 UTC, Simon McVittie
Details | Splinter Review
[haze/next] Sync constants, servicetest with MC's 'next' version (19.19 KB, patch)
2013-09-26 18:37 UTC, Simon McVittie
Details | Splinter Review
[idle/next] Sync constants, servicetest with MC's 'next' version (17.49 KB, patch)
2013-09-26 18:38 UTC, Simon McVittie
Details | Splinter Review
[salut/next] Sync constants, servicetest with MC's 'next' version (21.45 KB, patch)
2013-09-26 18:39 UTC, Simon McVittie
Details | Splinter Review

Description Simon McVittie 2013-09-26 17:32:41 UTC
MC and Gabble have a very nice complete merged version of constants.py for 0.x.

Haze, Salut and Idle have a rather less complete version of constants.py, with somewhat ad-hoc patches to update it to 0.99.1.
Comment 1 Simon McVittie 2013-09-26 18:35:59 UTC
Created attachment 86667 [details] [review]
[mc/next] constants, servicetest: update to Telepathy 1

This is not as trivial as it might seem. Some (but not all!) interfaces
have gained versioning (a trailing "1" in practice), some enums have
been renumbered, and some things have been deleted.

I'm reasonably sure this version is correct: I've tested it in Haze,
Idle and Salut.

---

This will make the 'next' branch fail its tests, but that's rather inevitable anyway while we do all the sed operations.
Comment 2 Simon McVittie 2013-09-26 18:37:20 UTC
Created attachment 86668 [details] [review]
[haze/next] Sync constants, servicetest with MC's 'next' version

---

Same files as Attachment #86667 [details]. Tests still pass, if the patches from Bug #69855 are applied to both tp-glib and Haze.
Comment 3 Simon McVittie 2013-09-26 18:38:23 UTC
Created attachment 86669 [details] [review]
[idle/next] Sync constants, servicetest with MC's 'next' version

---

Tests pass (tested with the telepathy-glib from Bug #69855, which I'll tag as 0.99.2 if approved).
Comment 4 Simon McVittie 2013-09-26 18:39:13 UTC
Created attachment 86670 [details] [review]
[salut/next] Sync constants, servicetest with MC's 'next' version

---

Tests pass, with the same tp-glib from Bug #69855.

That's all for now.
Comment 5 Guillaume Desmottes 2013-09-27 07:13:47 UTC
Comment on attachment 86667 [details] [review]
[mc/next] constants, servicetest: update to Telepathy 1

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

::: tests/twisted/servicetest.py
@@ +604,4 @@
>          return self.inspect_contacts_sync([handle])[0]
>  
>      def inspect_contacts_sync(self, handles):
> +        h2asv = self.Contacts.GetContactAttributes(handles, [])

strictly speaking this is not related to this patch.
Comment 6 Guillaume Desmottes 2013-09-27 07:14:27 UTC
Comment on attachment 86668 [details] [review]
[haze/next] Sync constants, servicetest with MC's 'next' version

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

++
Comment 7 Guillaume Desmottes 2013-09-27 07:14:42 UTC
Comment on attachment 86669 [details] [review]
[idle/next] Sync constants, servicetest with MC's 'next' version

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

++
Comment 8 Guillaume Desmottes 2013-09-27 07:14:50 UTC
Comment on attachment 86670 [details] [review]
[salut/next] Sync constants, servicetest with MC's 'next' version

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

++
Comment 9 Simon McVittie 2013-09-27 11:39:48 UTC
(In reply to comment #5)
> > +        h2asv = self.Contacts.GetContactAttributes(handles, [])
> 
> strictly speaking this is not related to this patch.

It's a piece of code in the "unified" servicetest, that will no longer work in Telepathy 1. How is that not related? :-)
Comment 10 Simon McVittie 2013-09-27 14:07:24 UTC
Fixed in git for 0.99.2 (and in MC's new 'next' branch which doesn't work yet), thanks


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.