Unity

Merge lp:~mandel/unity/fix-autopilot into lp:unity

  1. fix-autopilot
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3430
Proposed branch: lp:~mandel/unity/fix-autopilot
Merge into: lp:unity
Diff against target: 87 lines (+19/-1)
6 files modified
dash/previews/ErrorPreview.cpp (+5/-0)
dash/previews/ErrorPreview.h (+2/-0)
dash/previews/MusicPaymentPreview.cpp (+5/-0)
dash/previews/MusicPaymentPreview.h (+1/-0)
dash/previews/PaymentPreview.cpp (+5/-1)
dash/previews/PaymentPreview.h (+1/-0)
To merge this branch: bzr merge lp:~mandel/unity/fix-autopilot
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Leo Arias (community) Approve
Review via email: mp+174446@code.launchpad.net

Commit message

Fix the introspection so that QA can work with autopilot.

Description of the change

Fix the introspection so that QA can work with autopilot.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

This solves the problem explained in the linked bug.
Thank you Manuel.

Some changes on the autopilot emulators for uniyt will come handy with this. I'll work on that on a following branch.

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks fine!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3419
http://jenkins.qa.ubuntu.com/job/unity-ci/236/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/123/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/124

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/236/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/148/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/808
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/101/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/101

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/157/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/853/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/110
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/110/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/110

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dash/previews/ErrorPreview.cpp'
--- dash/previews/ErrorPreview.cpp 2013-06-05 16:06:33 +0000
+++ dash/previews/ErrorPreview.cpp 2013-07-12 15:35:37 +0000
@@ -91,6 +91,11 @@
91 return "ErrorPreview";91 return "ErrorPreview";
92}92}
9393
94void ErrorPreview::AddProperties(GVariantBuilder* builder)
95{
96 PaymentPreview::AddProperties(builder);
97}
98
94void ErrorPreview::OnActionActivated(ActionButton* button, std::string const& id)99void ErrorPreview::OnActionActivated(ActionButton* button, std::string const& id)
95{100{
96 Preview::OnActionActivated(button, id);101 Preview::OnActionActivated(button, id);
97102
=== modified file 'dash/previews/ErrorPreview.h'
--- dash/previews/ErrorPreview.h 2013-05-10 09:44:12 +0000
+++ dash/previews/ErrorPreview.h 2013-07-12 15:35:37 +0000
@@ -72,6 +72,8 @@
72 unsigned long special_keys_state);72 unsigned long special_keys_state);
73 // From debug::Introspectable73 // From debug::Introspectable
74 std::string GetName() const;74 std::string GetName() const;
75 void AddProperties(GVariantBuilder* builder);
76
75 nux::Layout* GetTitle();77 nux::Layout* GetTitle();
76 nux::Layout* GetPrice();78 nux::Layout* GetPrice();
77 nux::Layout* GetBody();79 nux::Layout* GetBody();
7880
=== modified file 'dash/previews/MusicPaymentPreview.cpp'
--- dash/previews/MusicPaymentPreview.cpp 2013-06-04 15:30:22 +0000
+++ dash/previews/MusicPaymentPreview.cpp 2013-07-12 15:35:37 +0000
@@ -84,6 +84,11 @@
84 return "MusicPaymentPreview";84 return "MusicPaymentPreview";
85}85}
8686
87void MusicPaymentPreview::AddProperties(GVariantBuilder* builder)
88{
89 PaymentPreview::AddProperties(builder);
90}
91
87void MusicPaymentPreview::OnActionActivated(ActionButton* button, std::string const& id)92void MusicPaymentPreview::OnActionActivated(ActionButton* button, std::string const& id)
88{93{
89 // Check the action id and send the password only when we94 // Check the action id and send the password only when we
9095
=== modified file 'dash/previews/MusicPaymentPreview.h'
--- dash/previews/MusicPaymentPreview.h 2013-04-25 19:29:13 +0000
+++ dash/previews/MusicPaymentPreview.h 2013-07-12 15:35:37 +0000
@@ -74,6 +74,7 @@
7474
75 // From debug::Introspectable75 // From debug::Introspectable
76 std::string GetName() const;76 std::string GetName() const;
77 void AddProperties(GVariantBuilder* builder);
7778
78 nux::Layout* GetTitle();79 nux::Layout* GetTitle();
79 nux::Layout* GetPrice();80 nux::Layout* GetPrice();
8081
=== modified file 'dash/previews/PaymentPreview.cpp'
--- dash/previews/PaymentPreview.cpp 2013-05-06 11:57:14 +0000
+++ dash/previews/PaymentPreview.cpp 2013-07-12 15:35:37 +0000
@@ -194,9 +194,13 @@
194194
195std::string PaymentPreview::GetName() const195std::string PaymentPreview::GetName() const
196{196{
197 return "";197 return "PaymentPreview";
198}198}
199199
200void PaymentPreview::AddProperties(GVariantBuilder* builder)
201{
202 Preview::AddProperties(builder);
203}
200204
201nux::Layout* PaymentPreview::GetHeader()205nux::Layout* PaymentPreview::GetHeader()
202{206{
203207
=== modified file 'dash/previews/PaymentPreview.h'
--- dash/previews/PaymentPreview.h 2013-04-25 19:29:13 +0000
+++ dash/previews/PaymentPreview.h 2013-07-12 15:35:37 +0000
@@ -60,6 +60,7 @@
6060
61 // From debug::Introspectable61 // From debug::Introspectable
62 std::string GetName() const;62 std::string GetName() const;
63 void AddProperties(GVariantBuilder* builder);
6364
64 // Create and connect an action link to OnActionLinkActivated65 // Create and connect an action link to OnActionLinkActivated
65 nux::ObjectPtr<ActionLink> CreateLink(dash::Preview::ActionPtr action);66 nux::ObjectPtr<ActionLink> CreateLink(dash::Preview::ActionPtr action);