[kdbus] Update kdbus interface header (commit: b620b72c9127) 14/10/16

[platform/upstream/glib.git] / gio / tests / gdbus-introspection.c

diff --git a/gio/tests/gdbus-introspection.c b/gio/tests/gdbus-introspection.c
index 79daacb..84ba23c 100644 (file)
--- a/gio/tests/gdbus-introspection.c
+++ b/gio/tests/gdbus-introspection.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: David Zeuthen <davidz@redhat.com>
  */
@@ -163,7 +161,9 @@ test_generate (void)
   "      <method name='Sleep'>"
   "        <arg type='i' name='timeout' direction='in'/>"
   "      </method>"
-  "      <property name='y' type='y' access='readwrite'/>"
+  "      <property name='y' type='y' access='readwrite'>"
+  "        <annotation name='needs-escaping' value='bar&lt;&gt;&apos;&quot;'/>"
+  "      </property>"
   "    </interface>"
   "  </node>";
 
@@ -310,16 +310,15 @@ main (int   argc,
   /* all the tests rely on a shared main loop */
   loop = g_main_loop_new (NULL, FALSE);
 
-  session_bus_up ();
-
   g_test_add_func ("/gdbus/introspection-parser", test_introspection_parser);
   g_test_add_func ("/gdbus/introspection-generate", test_generate);
   g_test_add_func ("/gdbus/introspection-default-direction", test_default_direction);
   g_test_add_func ("/gdbus/introspection-extra-data", test_extra_data);
 
-  ret = g_test_run ();
+  ret = session_bus_run ();
 
-  session_bus_down ();
+  while (g_main_context_iteration (NULL, FALSE));
+  g_main_loop_unref (loop);
 
   return ret;
 }