1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00

Fix virsystemdtest for previous commit

The change to query org.freedesktop.DBus.ListActivatableNames
to detect systemd broke the test suite, since we did not have
stubs to respond to this dbus call.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-09-11 15:29:52 +01:00
parent 7ada155cdf
commit 468f684e84
2 changed files with 40 additions and 18 deletions

View File

@ -65,29 +65,47 @@ dbus_bool_t dbus_message_set_reply_serial(DBusMessage *message ATTRIBUTE_UNUSED,
} }
DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connection ATTRIBUTE_UNUSED,
DBusMessage *message ATTRIBUTE_UNUSED, DBusMessage *message,
int timeout_milliseconds ATTRIBUTE_UNUSED, int timeout_milliseconds ATTRIBUTE_UNUSED,
DBusError *error) DBusError *error ATTRIBUTE_UNUSED)
{ {
DBusMessage *reply = NULL; DBusMessage *reply = NULL;
const char *service = dbus_message_get_destination(message);
if (getenv("FAIL_BAD_SERVICE")) { if (STREQ(service, "org.freedesktop.machine1")) {
DBusMessageIter iter; if (getenv("FAIL_BAD_SERVICE")) {
const char *error_message = "Something went wrong creating the machine"; DBusMessageIter iter;
if (!(reply = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR))) const char *error_message = "Something went wrong creating the machine";
return NULL; if (!(reply = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR)))
dbus_message_set_error_name(reply, "org.freedesktop.systemd.badthing"); return NULL;
dbus_message_iter_init_append(reply, &iter); dbus_message_set_error_name(reply, "org.freedesktop.systemd.badthing");
if (!dbus_message_iter_append_basic(&iter, dbus_message_iter_init_append(reply, &iter);
DBUS_TYPE_STRING, if (!dbus_message_iter_append_basic(&iter,
&error_message)) { DBUS_TYPE_STRING,
dbus_message_unref(reply); &error_message)) {
return NULL; dbus_message_unref(reply);
return NULL;
}
} else {
reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN);
} }
} else if (getenv("FAIL_NO_SERVICE")) { } else if (STREQ(service, "org.freedesktop.DBus")) {
dbus_set_error(error, const char *svc1 = "org.foo.bar.wizz";
"org.freedesktop.DBus.Error.ServiceUnknown", const char *svc2 = "org.freedesktop.machine1";
"%s", "The name org.freedesktop.machine1 was not provided by any .service files"); DBusMessageIter iter, sub;
reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN);
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
"s", &sub);
dbus_message_iter_append_basic(&sub,
DBUS_TYPE_STRING,
&svc1);
if (!getenv("FAIL_NO_SERVICE"))
dbus_message_iter_append_basic(&sub,
DBUS_TYPE_STRING,
&svc2);
dbus_message_iter_close_container(&iter, &sub);
} else { } else {
reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN);
} }

View File

@ -94,9 +94,11 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED)
123, 123,
false, false,
NULL)) == 0) { NULL)) == 0) {
unsetenv("FAIL_NO_SERVICE");
fprintf(stderr, "%s", "Unexpected create machine success\n"); fprintf(stderr, "%s", "Unexpected create machine success\n");
return -1; return -1;
} }
unsetenv("FAIL_NO_SERVICE");
if (rv != -2) { if (rv != -2) {
fprintf(stderr, "%s", "Unexpected create machine error\n"); fprintf(stderr, "%s", "Unexpected create machine error\n");
@ -126,9 +128,11 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED)
123, 123,
false, false,
NULL)) == 0) { NULL)) == 0) {
unsetenv("FAIL_BAD_SERVICE");
fprintf(stderr, "%s", "Unexpected create machine success\n"); fprintf(stderr, "%s", "Unexpected create machine success\n");
return -1; return -1;
} }
unsetenv("FAIL_BAD_SERVICE");
if (rv != -1) { if (rv != -1) {
fprintf(stderr, "%s", "Unexpected create machine error\n"); fprintf(stderr, "%s", "Unexpected create machine error\n");