From 580b26c2c30c28ef417009f08296ffa43bb76e0c Mon Sep 17 00:00:00 2001
Message-Id: <580b26c2c30c28ef417009f08296ffa43bb76e0c.1381871412.git.jdenemar@redhat.com>
From: Eric Blake <eblake@redhat.com>
Date: Mon, 14 Oct 2013 16:45:10 +0100
Subject: [PATCH] tests: work with older dbus

For

  https://bugzilla.redhat.com/show_bug.cgi?id=1018730

On RHEL 5, with dbus 1.1.2, compilation failed with:

virsystemdmock.c: In function 'dbus_connection_send_with_reply_and_block':
virsystemdmock.c:68: warning: implicit declaration of function 'dbus_message_set_serial'

Fix this by instead bypassing all attempts to use a dbus serial.

* tests/virsystemdmock.c (dbus_message_set_reply_serial): Add new
override.
(dbus_connection_send_with_reply_and_block): No longer bother with
the serial.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit edfae3dccf5eceeb86e1c4304dca8a8ed0f74e57)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 tests/virsystemdmock.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c
index b6c3695..ded52d2 100644
--- a/tests/virsystemdmock.c
+++ b/tests/virsystemdmock.c
@@ -58,6 +58,12 @@ dbus_bool_t dbus_connection_set_watch_functions(DBusConnection *connection ATTRI
     return 1;
 }
 
+dbus_bool_t dbus_message_set_reply_serial(DBusMessage *message ATTRIBUTE_UNUSED,
+                                          dbus_uint32_t serial ATTRIBUTE_UNUSED)
+{
+    return 1;
+}
+
 DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connection ATTRIBUTE_UNUSED,
                                                        DBusMessage *message,
                                                        int timeout_milliseconds ATTRIBUTE_UNUSED,
@@ -65,8 +71,6 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio
 {
     DBusMessage *reply = NULL;
 
-    dbus_message_set_serial(message, 7);
-
     if (getenv("FAIL_BAD_SERVICE"))
         reply = dbus_message_new_error(message,
                                        "org.freedesktop.systemd.badthing",
-- 
1.8.3.2