[yast-commit] r57640 - in /trunk/core: dbus/namespace_service/src/ dbus/namespace_service/testsuite/ dbus/namespace_service/testsuite/modules/ liby2dbus/src/

Author: lslezak Date: Thu Jun 18 16:44:22 2009 New Revision: 57640 URL: http://svn.opensuse.org/viewcvs/yast?rev=57640&view=rev Log: DBus service '--session' command line parameter has been changed to '--test' - it runs the service on the session bus and disables PolicyKit checks. It is used in the testsuite, can be useful for testing/debugging. Modified: trunk/core/dbus/namespace_service/src/DBusModulesServer.cc trunk/core/dbus/namespace_service/src/DBusModulesServer.h trunk/core/dbus/namespace_service/src/yast_modules_dbus_server.cc trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp trunk/core/dbus/namespace_service/testsuite/t1 trunk/core/liby2dbus/src/DBusConn.cc trunk/core/liby2dbus/src/DBusServerBase.cc trunk/core/liby2dbus/src/DBusServerBase.h Modified: trunk/core/dbus/namespace_service/src/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/src/DBusModulesServer.cc?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/src/DBusModulesServer.cc (original) +++ trunk/core/dbus/namespace_service/src/DBusModulesServer.cc Thu Jun 18 16:44:22 2009 @@ -229,11 +229,11 @@ } -DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces, bool use_session_bus) +DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces, bool test_mode) : e(this) , manager_callback(this) , wfm(NULL) - , m_use_session_bus(use_session_bus) + , m_test_mode(test_mode) { init_wfm(); @@ -317,7 +317,7 @@ bool DBusModulesServer::connect() { registerManager(); - return DBusServerBase::connect(m_use_session_bus? SESSION: SYSTEM, + return DBusServerBase::connect(m_test_mode ? SESSION : SYSTEM, YAST_DBUS_SERVICE_NAME); } Modified: trunk/core/dbus/namespace_service/src/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/src/DBusModulesServer.h?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/src/DBusModulesServer.h (original) +++ trunk/core/dbus/namespace_service/src/DBusModulesServer.h Thu Jun 18 16:44:22 2009 @@ -24,7 +24,7 @@ typedef std::liststd::string NameSpaceList; - DBusModulesServer(const NameSpaceList &name_spaces, bool use_session_bus); + DBusModulesServer(const NameSpaceList &name_spaces, bool test_mode); virtual ~DBusModulesServer(); virtual bool connect(); @@ -95,7 +95,7 @@ void init_wfm(); - bool m_use_session_bus; + bool m_test_mode; }; Modified: trunk/core/dbus/namespace_service/src/yast_modules_dbus_server.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/src/yast_modules_dbus_server.cc?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/src/yast_modules_dbus_server.cc (original) +++ trunk/core/dbus/namespace_service/src/yast_modules_dbus_server.cc Thu Jun 18 16:44:22 2009 @@ -11,7 +11,7 @@ bool forever = false; bool badopts = false; - bool use_session_bus = false; + bool test_mode = false; DBusModulesServer::NameSpaceList modules; @@ -29,9 +29,9 @@ { forever = true; } - else if (!strcmp(argv[index], "--session")) + else if (!strcmp(argv[index], "--test")) { - use_session_bus = true; + test_mode = true; } else { @@ -47,12 +47,13 @@ std::cerr << "Usage: " << argv[0] << " [--help] [--disable-timer] [--session] <namespace> <namespace>..." << std::endl; std::cerr << " --help Print this text\n"; std::cerr << " --disable-timer Disable automatic shutdown of the service, useful for debugging\n"; - std::cerr << " --session Connect to the session bus (system is the default), useful for debugging\n"; + std::cerr << " --test Set the test mode - Connect to the session bus (system is the default),\n"; + std::cerr << " disable PolicyKit checks. Useful for testing or debugging.\n"; std::cerr << " <namespace> Preload an yast namespace and export it on DBus\n"; return 1; } - DBusModulesServer server(modules, use_session_bus); + DBusModulesServer server(modules, test_mode); bool connected = server.connect(); if (connected) Modified: trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am (original) +++ trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am Thu Jun 18 16:44:22 2009 @@ -4,7 +4,7 @@ yast_modules_ybc = $(yast_modules:.ycp=.ybc) $(yast_modules_ybc): $(yast_modules) - ycpc -c $< + ../../../../base/tools/ycpc/ycpc -c $< all: $(yast_modules_ybc) Modified: trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp (original) +++ trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp Thu Jun 18 16:44:22 2009 @@ -1,4 +1,7 @@ +// This is a testing module for the YaST DBuse service +// Some methods are not called during tests, but the correct signature is checked in the introspection test + { module "TEST"; @@ -6,7 +9,7 @@ global define list List() {return [];} -global define list ListAny() +global define list<any> ListAny() {return [];} global define list ListAny1() @@ -15,7 +18,6 @@ global define list ListAny2() {return [["dssd", 123], ["zxcxczzx", 456]];} - global define list<string> ListString() {return ["dssd", "sdfdfs"];} @@ -67,6 +69,9 @@ global define map MapAny4() {return $[ "3" : $["l" : ["3", 10, $["a" : "b"]]]];} +// Note: interger key is returned as string in map type, +// map must be used to return int, +// Dbus requires a basic type as key, a variant cannot be sent global define map MapAny5() {return $[ 3 : 4, "4" : "5" ];} Modified: trunk/core/dbus/namespace_service/testsuite/t1 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/t1?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/t1 (original) +++ trunk/core/dbus/namespace_service/testsuite/t1 Thu Jun 18 16:44:22 2009 @@ -1,8 +1,12 @@ #! /bin/sh -#set -x +# A basic test: Does the server return the correct introspection data? +# Do the return values match the signature? -# A basic test: does the server reply to introspection? +# It reads *.test files, calls the DBus method with the name of the file, +# the result of the call must match the file content + +# Currently this test checks only return values of functions without parameters. # TODO: more tests, probably in python or whatever so that # the responses can be inspected better @@ -19,19 +23,21 @@ export Y2DIR=. # start the server, preload TEST.ycp module -PRG="../src/yast_modules_dbus_server --disable-timer --session TEST" +PRG="../src/yast_modules_dbus_server --disable-timer --test TEST" $PRG & sleep 3 echo "off we go!" SEND0="dbus-send --session --dest=org.opensuse.YaST.modules" CALL="$SEND0 --type=method_call" +# read al *.test files in the current directory find . -name '*.test' | while read TESTFILE; do TESTCALL=`echo "$TESTFILE" | sed -e "s#./\(.*\).test#\1#"` echo -n "Testing $TESTCALL ... " - # call the DBus method, ignore the first two lines (the header) + # call the DBus method, ignore the first two lines (the header contains non-constant data) REPLY=`$CALL --print-reply /org/opensuse/YaST/modules/TEST $TESTCALL | tail -n +2 > $TESTFILE.reply` + # the result with the expected value if diff -u $TESTFILE $TESTFILE.reply > /dev/null; then echo "OK" else Modified: trunk/core/liby2dbus/src/DBusConn.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/DBusConn.cc?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/liby2dbus/src/DBusConn.cc (original) +++ trunk/core/liby2dbus/src/DBusConn.cc Thu Jun 18 16:44:22 2009 @@ -32,14 +32,14 @@ return true; } - y2milestone("Connecting to DBus..."); + y2milestone("Connecting to DBus (%s bus)...", type == DBUS_BUS_SYSTEM ? "system" : "session"); - // connect to the system bus + // connect to the bus connection = dbus_bus_get(type, &dbus_error); if (dbus_error_is_set(&dbus_error)) { - y2error("Cannot connect to the system bus: %s", dbus_error.message); + y2error("Cannot connect to the bus: %s", dbus_error.message); return false; } Modified: trunk/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/DBusServerBase.cc?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/liby2dbus/src/DBusServerBase.cc (original) +++ trunk/core/liby2dbus/src/DBusServerBase.cc Thu Jun 18 16:44:22 2009 @@ -21,8 +21,9 @@ int timeout_counter = YAST_DBUS_SHUTDOWN_TIMEOUT_COUNT; -DBusServerBase::DBusServerBase() +DBusServerBase::DBusServerBase(bool testmode) { + test_mode = testmode; dbus_threads_init_default(); } @@ -261,8 +262,8 @@ policykit.checkPolkitChanges(); #endif - // check the policy using PolicyKit - if (isActionAllowed(request, &dbus_error)) + // check the policy using PolicyKit, the check is disabled in the test mode + if (test_mode || isActionAllowed(request, &dbus_error)) { // find the registered object std::string objname = request.path(); Modified: trunk/core/liby2dbus/src/DBusServerBase.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/DBusServerBase.h?rev=57640&r1=57639&r2=57640&view=diff ============================================================================== --- trunk/core/liby2dbus/src/DBusServerBase.h (original) +++ trunk/core/liby2dbus/src/DBusServerBase.h Thu Jun 18 16:44:22 2009 @@ -23,7 +23,7 @@ { public: - DBusServerBase(); + DBusServerBase(bool testmode = false); virtual ~DBusServerBase(); virtual bool connect() = 0; @@ -60,6 +60,7 @@ std::string service_name; + bool test_mode; private: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org