Attachment 115219 Details for Bug 89595 – tests: Add new TpLogger logs that don't parse as XML

[patch] tests: Add new TpLogger logs that don't parse as XML

0001-tests-Add-new-TpLogger-logs-that-don-t-parse-as-XML.patch (text/plain), 4.36 KB, created by Debarshi Ray on 2015-04-20 12:17:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Debarshi Ray

Created: 2015-04-20 12:17:13 UTC

Size: 4.36 KB

patch

obsolete

>From 89ad4c941816b7b09c20c7111086d965d87861e7 Mon Sep 17 00:00:00 2001
>From: Debarshi Ray <debarshir@freedesktop.org>
>Date: Mon, 20 Apr 2015 11:13:44 +0200
>Subject: [PATCH 1/3] tests: Add new TpLogger logs that don't parse as XML
>
>This is meant to flex the error handling code paths.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=40675
>https://bugs.freedesktop.org/show_bug.cgi?id=89595
>---
> tests/dbus/test-log-manager.c                                       | 2 +-
> tests/dbus/test-tpl-log-store-xml.c                                 | 2 +-
> .../user6@collabora.co.uk/20140101.log                              | 6 ++++++
> .../user6@collabora.co.uk/20140102.log                              | 6 ++++++
> .../user6@collabora.co.uk/20140103.log                              | 5 +++++
> 5 files changed, 19 insertions(+), 2 deletions(-)
> create mode 100644 tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140101.log
> create mode 100644 tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140102.log
> create mode 100644 tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140103.log
>
>diff --git a/tests/dbus/test-log-manager.c b/tests/dbus/test-log-manager.c
>index 3a2bf3f..701d948 100644
>--- a/tests/dbus/test-log-manager.c
>+++ b/tests/dbus/test-log-manager.c
>@@ -540,7 +540,7 @@ test_get_entities (TestCaseFixture *fixture,
>       get_entities_cb, fixture);
>   g_main_loop_run (fixture->main_loop);
> 
>-  g_assert_cmpint (g_list_length (fixture->ret), ==, 5);
>+  g_assert_cmpint (g_list_length (fixture->ret), ==, 6);
> 
>   /* we do not want duplicates */
>   fixture->ret = g_list_sort (fixture->ret, (GCompareFunc) _tpl_entity_compare);
>diff --git a/tests/dbus/test-tpl-log-store-xml.c b/tests/dbus/test-tpl-log-store-xml.c
>index e2bd4d8..5b109e0 100644
>--- a/tests/dbus/test-tpl-log-store-xml.c
>+++ b/tests/dbus/test-tpl-log-store-xml.c
>@@ -122,7 +122,7 @@ test_clear (XmlTestCaseFixture *fixture,
>       TPL_EVENT_MASK_TEXT);
> 
>   g_assert (hits != NULL);
>-  g_assert_cmpint (g_list_length (hits), ==, 4);
>+  g_assert_cmpint (g_list_length (hits), ==, 5);
> 
>   tpl_log_manager_search_free (hits);
> 
>diff --git a/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140101.log b/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140101.log
>new file mode 100644
>index 0000000..26a149c
>--- /dev/null
>+++ b/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140101.log
>@@ -0,0 +1,6 @@
>+<?xml version='1.0' encoding='utf-8'?>
>+<?xml-stylesheet type="text/xsl" href="log-store-xml.xsl"?>
>+<log>
>+<message time='20140101T09:26:07' cm_id='456' id='user6@collabora.co.uk' name='User6' token='' isuser='false' type='normal'>1</message>
>+<message time='20140101T09:27:20' cm_id='456' id='user6@collabora.co.uk' name='User6' token='' isuser='false' type='normal'>2</message>
>+</log>
>diff --git a/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140102.log b/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140102.log
>new file mode 100644
>index 0000000..5cd55b8
>--- /dev/null
>+++ b/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140102.log
>@@ -0,0 +1,6 @@
>+<?xml version='1.0' encoding='utf-8'?>
>+<?xml-stylesheet type="text/xsl" href="log-store-xml.xsl"?>
>+<log>
>+<message time='20140102T16:27:50' cm_id='456' id='user6@collabora.co.uk' name='User6' token='' isuser='false' type='normal'>&#x8;</message>
>+<message time='20140102T16:27:51' cm_id='456' id='user6@collabora.co.uk' name='User6' token='' isuser='false' type='normal'>3&#x8;4</message>
>+</log>
>diff --git a/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140103.log b/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140103.log
>new file mode 100644
>index 0000000..80a9e6c
>--- /dev/null
>+++ b/tests/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user6@collabora.co.uk/20140103.log
>@@ -0,0 +1,5 @@
>+<?xml version='1.0' encoding='utf-8'?>
>+<?xml-stylesheet type="text/xsl" href="log-store-xml.xsl"?>
>+<log>
>+<message time='20140103T09:26:07' cm_id='456' id='user@collabora.co.uk' name='User1' token='' isuser='false' type='normal'>5</message>
>+</log>
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 89595: 114349 | 115213 | 115217 | 115218 | 115219 | 115220 | 115221

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.