Merge lp:~ted/pay-service/staging-dbus into lp:pay-service/14.10

[Ted Gould]

When setting up staging set the DBus activation environment as well

Since online accounts is using dbus activation we need to ensure that its environment also gets these variables.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/pay-service-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-amd64-ci/17
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/pay-service-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/pay-service-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/17/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/setup-staging.sh'
--- tests/setup-staging.sh	2014-06-13 21:36:08 +0000
+++ tests/setup-staging.sh	2014-06-27 14:13:30 +0000
@@ -2,15 +2,32 @@
 # This small script sets up the variables needed for acceptance
 # testing of the pay-service and pay related things.
 
-echo "Setting up staging environment variables"
-
-initctl set-env --global SSO_AUTH_BASE_URL=https://login.staging.ubuntu.com
-initctl set-env --global SSO_UONE_BASE_URL=https://staging.one.ubuntu.com
-initctl set-env --global PAY_BASE_URL=https://sc.staging.ubuntu.com/api/2.0/click/
-initctl set-env --global URL_PACKAGE_INFO=https://search.apps.staging.ubuntu.com/api/v1/package/
-initctl set-env --global ACCOUNT_CREDS_URL=https://login.staging.ubuntu.com/api/v2/tokens/oauth
-initctl set-env --global ADD_PAYMENT_URL=https://sc.staging.ubuntu.com/api/2.0/click/paymentmethods/add/
-initctl set-env --global U1_SEARCH_BASE_URL=https://search.apps.staging.ubuntu.com/
+
+SSO_AUTH_BASE_URL=https://login.staging.ubuntu.com
+SSO_UONE_BASE_URL=https://staging.one.ubuntu.com
+PAY_BASE_URL=https://sc.staging.ubuntu.com/api/2.0/click/
+URL_PACKAGE_INFO=https://search.apps.staging.ubuntu.com/api/v1/package/
+ACCOUNT_CREDS_URL=https://login.staging.ubuntu.com/api/v2/tokens/oauth
+ADD_PAYMENT_URL=https://sc.staging.ubuntu.com/api/2.0/click/paymentmethods/add/
+U1_SEARCH_BASE_URL=https://search.apps.staging.ubuntu.com/
+
+echo "Setting up upstart environment variables"
+
+initctl set-env --global SSO_AUTH_BASE_URL=$SSO_AUTH_BASE_URL
+initctl set-env --global SSO_UONE_BASE_URL=$SSO_UONE_BASE_URL
+initctl set-env --global PAY_BASE_URL=$PAY_BASE_URL
+initctl set-env --global URL_PACKAGE_INFO=$URL_PACKAGE_INFO
+initctl set-env --global ACCOUNT_CREDS_URL=$ACCOUNT_CREDS_URL
+initctl set-env --global ADD_PAYMENT_URL=$ADD_PAYMENT_URL
+initctl set-env --global U1_SEARCH_BASE_URL=$U1_SEARCH_BASE_URL
+
+echo "Setting up dbus environment variables"
+
+gdbus call --session \
+	--dest org.freedesktop.DBus \
+	--object-path / \
+	--method org.freedesktop.DBus.UpdateActivationEnvironment \
+	"[{'SSO_AUTH_BASE_URL', '$SSO_AUTH_BASE_URL'}, {'SSO_UONE_BASE_URL', '$SSO_UONE_BASE_URL'}, {'PAY_BASE_URL', '$PAY_BASE_URL'}, {'URL_PACKAGE_INFO', '$URL_PACKAGE_INFO'}, {'ACCOUNT_CREDS_URL', '$ACCOUNT_CREDS_URL'}, {'ADD_PAYMENT_URL', '$ADD_PAYMENT_URL'}, {'U1_SEARCH_BASE_URL', '$U1_SEARCH_BASE_URL'}]"
 
 echo "Restarting scope registry"
 restart scope-registry