← Back to branch summary

~thomas-voss/location-service/less-conservative-about-connection-characteristics

« back to all changes in this revision

Viewing changes to tests/acceptance_tests.cpp

  • Committer: Thomas Voß
  • Date: 2015-11-25 16:02:15 UTC
  • mto: This revision was merged to the branch mainline in revision 205.
  • Revision ID: thomas.voss@canonical.com-20151125160215-68d9jyl2ivc7hgww
Ensure two distinct bus instances.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance_tests.cpp
38
38
#include <com/ubuntu/location/service/stub.h>
39
39
 
40
40
#include <core/dbus/announcer.h>
 
41
#include <core/dbus/bus.h>
41
42
#include <core/dbus/fixture.h>
42
43
#include <core/dbus/resolver.h>
43
44
 
44
45
#include <core/dbus/asio/executor.h>
45
46
 
46
47
#include <core/posix/signal.h>
 
48
#include <core/posix/this_process.h>
47
49
 
48
50
#include <core/testing/cross_process_sync.h>
49
51
#include <core/testing/fork_and_run.h>
803
805
        };
804
806
 
805
807
        cul::service::Daemon::Configuration config;
806
 
        config.incoming = session_bus();
807
 
        config.outgoing = session_bus();
 
808
        config.incoming = std::make_shared<core::dbus::Bus>(core::posix::this_process::env::get_or_throw("DBUS_SESSION_BUS_ADDRESS"));
 
809
        config.outgoing = std::make_shared<core::dbus::Bus>(core::posix::this_process::env::get_or_throw("DBUS_SESSION_BUS_ADDRESS"));
808
810
        config.is_testing_enabled = false;
809
811
        config.providers =
810
812
        {