fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-08 20:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Treat root as a valid candidate for TEST_USER_ME

Browse source 
If spawn_dbus_daemon() can fail for TEST_USER_ME, then we'd have to
go through all the tests adding the ability to skip tests after
it fails, which is a fairly extensive change.

The tests have historically all run as whatever uid is supplied, and
if the tests are being run as root for some reason - perhaps in a CI
framework for an embedded platform that doesn't have non-root users,
or in an environment where you can be root or non-root but not both -
there is no particular reason to skip them.
This commit is contained in:
Simon McVittie 2015-02-03 19:35:39 +00:00
parent b1c54b5a75
commit 3cf71c2707
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/test-utils-glib.c
View file

@ -109,17 +109,7 @@ spawn_dbus_daemon (const gchar *binary,
const struct passwd *pwd = NULL;
#endif
if (user == TEST_USER_ME)
{
#ifdef DBUS_UNIX
if (getuid () == 0)
{
g_message ("SKIP: this test is not designed to run as root");
return NULL;
}
#endif
}
else
if (user != TEST_USER_ME)
{
#ifdef DBUS_UNIX
if (getuid () != 0)

7
test/test-utils-glib.h
View file

@ -44,12 +44,11 @@
* be run as an arbitrary non-root user, as above.
*
* Certain tests can usefully be run again, as root. When this is done,
* tests using TEST_USER_ME will be skipped, and tests using TEST_USER_ROOT,
* TEST_USER_MESSAGEBUS and/or TEST_USER_OTHER can exercise situations
* that only arise when there's more than one uid.
* tests using TEST_USER_ROOT, TEST_USER_MESSAGEBUS and/or TEST_USER_OTHER
* can exercise situations that only arise when there's more than one uid.
*/
typedef enum {
/* Whatever non-root user happens to be running the regression test;
/* Whatever user happens to be running the regression test;
* such tests also work on Windows */
TEST_USER_ME,
/* Must be uid 0 on Unix; the test is skipped on Windows */