DBus Test Runner

Merge lp:~ted/dbus-test-runner/reporting-delay into lp:dbus-test-runner/12.10

  1. reporting-delay
  2. Merge into trunk.12.10
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 56
Merged at revision: 45
Proposed branch: lp:~ted/dbus-test-runner/reporting-delay
Merge into: lp:dbus-test-runner/12.10
Diff against target: 392 lines (+73/-39)
11 files modified
libdbustest/Makefile.am (+1/-1)
libdbustest/bustle.c (+21/-8)
libdbustest/process.c (+27/-8)
libdbustest/service.c (+5/-5)
libdbustest/task.c (+1/-1)
src/Makefile.am (+1/-1)
src/dbus-test-runner.c (+7/-7)
tests/Makefile.am (+5/-6)
tests/test-bustle-data-check.sh (+3/-0)
tests/test-bustle-list.sh (+1/-1)
tests/test-bustle.reference (+1/-1)
To merge this branch: bzr merge lp:~ted/dbus-test-runner/reporting-delay
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+127375@code.launchpad.net

Commit message

Adding a clearing of the buffers to make tests pass on slow systems

Description of the change

Setting up the dispose function so that it clears the buffers when complete to make sure we get a full log out. This should hopefully make it so that the tests pass even when Jenkins is busy doing other things at the same time.

Didn't realize when I started, but the bustle test is failing in trunk. So I fixed that along the way. Which then, lead me to realize that the bustle test data test wasn't actually checking its data. So I fixed that too. End of the day, this should make the test suite in good shape.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/./label=precise/1/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Hey great incentive to fix a couple of failing tests not related to this MP, eh :) ?

lp:~ted/dbus-test-runner/reporting-delay updated
53. By Ted Gould

Adding glib explicitly, seems to be failing for Jenkins

54. By Ted Gould

Trying to turn on -Wextra to figure out what's up with Jenkins. Don't think there's huge value, but might as well commit.

55. By Ted Gould

Same treatment for /src

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/./label=precise/2/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

g_io_channel_read_line() always nul-terminates the string, so you don't need to do it manually. The rest of the new dispose code is fine.

I've no opinion on -Wextra but looks like it's not hurting anything.... :)

review: Approve
lp:~ted/dbus-test-runner/reporting-delay updated
56. By Ted Gould

Stop putting in terminators. You can have too much of a good thing

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/./label=precise/3/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/./label=precise/4/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/./build=pbuilder,distribution=quantal,flavor=amd64/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/./build=pbuilder,distribution=quantal,flavor=i386/6/console

review: Approve (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Sorry for the spam--the "passed" result is correct :) .

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbustest/Makefile.am'
--- libdbustest/Makefile.am 2012-04-20 20:08:10 +0000
+++ libdbustest/Makefile.am 2012-10-02 21:09:33 +0000
@@ -29,7 +29,7 @@
29 -I$(top_srcdir) \29 -I$(top_srcdir) \
30 -DDEFAULT_SESSION_CONF="\"$(datadir)/dbus-test-runner/session.conf\"" \30 -DDEFAULT_SESSION_CONF="\"$(datadir)/dbus-test-runner/session.conf\"" \
31 -DG_LOG_DOMAIN=\"libdbustest\" \31 -DG_LOG_DOMAIN=\"libdbustest\" \
32 -Wall -Werror32 -Wall -Werror -Wextra
3333
34libdbustest_la_LIBADD = \34libdbustest_la_LIBADD = \
35 $(DBUS_TEST_RUNNER_LIBS)35 $(DBUS_TEST_RUNNER_LIBS)
3636
=== modified file 'libdbustest/bustle.c'
--- libdbustest/bustle.c 2012-04-19 15:54:50 +0000
+++ libdbustest/bustle.c 2012-10-02 21:09:33 +0000
@@ -21,6 +21,7 @@
21#include "config.h"21#include "config.h"
22#endif22#endif
2323
24#include <glib.h>
24#include "dbus-test.h"25#include "dbus-test.h"
2526
26struct _DbusTestBustlePrivate {27struct _DbusTestBustlePrivate {
@@ -46,6 +47,12 @@
46static void process_run (DbusTestTask * task);47static void process_run (DbusTestTask * task);
47static DbusTestTaskState get_state (DbusTestTask * task);48static DbusTestTaskState get_state (DbusTestTask * task);
48static gboolean get_passed (DbusTestTask * task);49static gboolean get_passed (DbusTestTask * task);
50static gboolean bustle_writes (GIOChannel * channel,
51 GIOCondition condition,
52 gpointer data);
53static gboolean bustle_write_error (GIOChannel * channel,
54 GIOCondition condition,
55 gpointer data);
4956
50G_DEFINE_TYPE (DbusTestBustle, dbus_test_bustle, DBUS_TEST_TYPE_TASK);57G_DEFINE_TYPE (DbusTestBustle, dbus_test_bustle, DBUS_TEST_TYPE_TASK);
5158
@@ -105,18 +112,24 @@
105 }112 }
106113
107 if (bustler->priv->stdout != NULL) {114 if (bustler->priv->stdout != NULL) {
108 g_io_channel_shutdown(bustler->priv->stdout, TRUE, NULL);115 while (G_IO_IN & g_io_channel_get_buffer_condition(bustler->priv->stdout)) {
109 bustler->priv->stdout = NULL;116 bustle_writes(bustler->priv->stdout, 0 /* unused */, bustler->priv->file);
117 }
118
119 g_clear_pointer(&bustler->priv->stdout, g_io_channel_unref);
110 }120 }
111121
112 if (bustler->priv->stderr != NULL) {122 if (bustler->priv->stderr != NULL) {
113 g_io_channel_shutdown(bustler->priv->stderr, TRUE, NULL);123 while (G_IO_IN & g_io_channel_get_buffer_condition(bustler->priv->stderr)) {
114 bustler->priv->stderr = NULL;124 bustle_write_error(bustler->priv->stderr, 0 /* unused */, bustler);
125 }
126
127 g_clear_pointer(&bustler->priv->stderr, g_io_channel_unref);
115 }128 }
116129
117 if (bustler->priv->file != NULL) {130 if (bustler->priv->file != NULL) {
118 g_io_channel_shutdown(bustler->priv->file, TRUE, NULL);131 g_io_channel_shutdown(bustler->priv->file, TRUE, NULL);
119 bustler->priv->file = NULL;132 g_clear_pointer(&bustler->priv->file, g_io_channel_unref);
120 }133 }
121134
122 G_OBJECT_CLASS (dbus_test_bustle_parent_class)->dispose (object);135 G_OBJECT_CLASS (dbus_test_bustle_parent_class)->dispose (object);
@@ -165,7 +178,7 @@
165}178}
166179
167static void180static void
168bustle_watcher (GPid pid, gint status, gpointer data)181bustle_watcher (GPid pid, G_GNUC_UNUSED gint status, gpointer data)
169{182{
170 g_critical("Bustle Monitor exited abruptly!");183 g_critical("Bustle Monitor exited abruptly!");
171 DbusTestBustle * bustler = DBUS_TEST_BUSTLE(data);184 DbusTestBustle * bustler = DBUS_TEST_BUSTLE(data);
@@ -182,7 +195,7 @@
182}195}
183196
184static gboolean197static gboolean
185bustle_write_error (GIOChannel * channel, GIOCondition condition, gpointer data)198bustle_write_error (GIOChannel * channel, G_GNUC_UNUSED GIOCondition condition, gpointer data)
186{199{
187 gchar * line;200 gchar * line;
188 gsize termloc;201 gsize termloc;
@@ -208,7 +221,7 @@
208}221}
209222
210static gboolean223static gboolean
211bustle_writes (GIOChannel * channel, GIOCondition condition, gpointer data)224bustle_writes (GIOChannel * channel, G_GNUC_UNUSED GIOCondition condition, gpointer data)
212{225{
213 gchar * line;226 gchar * line;
214 gsize termloc;227 gsize termloc;
215228
=== modified file 'libdbustest/process.c'
--- libdbustest/process.c 2012-04-23 03:38:09 +0000
+++ libdbustest/process.c 2012-10-02 21:09:33 +0000
@@ -30,6 +30,7 @@
30 GPid pid;30 GPid pid;
31 guint io_watch;31 guint io_watch;
32 guint watcher;32 guint watcher;
33 GIOChannel * io_chan;
3334
34 gboolean complete;35 gboolean complete;
35 gint status;36 gint status;
@@ -74,6 +75,7 @@
7475
75 self->priv->executable = NULL;76 self->priv->executable = NULL;
76 self->priv->parameters = NULL;77 self->priv->parameters = NULL;
78 self->priv->io_chan = NULL;
7779
78 return;80 return;
79}81}
@@ -103,6 +105,26 @@
103 process->priv->pid = 0;105 process->priv->pid = 0;
104 }106 }
105107
108 if (process->priv->io_chan != NULL) {
109 GIOStatus status = G_IO_STATUS_NORMAL;
110
111 while ((G_IO_IN & g_io_channel_get_buffer_condition(process->priv->io_chan)) && status == G_IO_STATUS_NORMAL) {
112 gchar * line = NULL;
113 gsize termloc;
114
115 status = g_io_channel_read_line (process->priv->io_chan, &line, NULL, &termloc, NULL);
116
117 if (status != G_IO_STATUS_NORMAL) {
118 continue;
119 }
120
121 dbus_test_task_print(DBUS_TEST_TASK(process), line);
122 g_free(line);
123 }
124
125 g_clear_pointer(&process->priv->io_chan, g_io_channel_unref);
126 }
127
106 G_OBJECT_CLASS (dbus_test_process_parent_class)->dispose (object);128 G_OBJECT_CLASS (dbus_test_process_parent_class)->dispose (object);
107 return;129 return;
108}130}
@@ -143,7 +165,7 @@
143}165}
144166
145static gboolean167static gboolean
146proc_writes (GIOChannel * channel, GIOCondition condition, gpointer data)168proc_writes (GIOChannel * channel, G_GNUC_UNUSED GIOCondition condition, gpointer data)
147{169{
148 g_return_val_if_fail(DBUS_TEST_IS_PROCESS(data), FALSE);170 g_return_val_if_fail(DBUS_TEST_IS_PROCESS(data), FALSE);
149 DbusTestProcess * process = DBUS_TEST_PROCESS(data);171 DbusTestProcess * process = DBUS_TEST_PROCESS(data);
@@ -164,8 +186,6 @@
164 continue;186 continue;
165 }187 }
166188
167 line[termloc] = '\0';
168
169 dbus_test_task_print(DBUS_TEST_TASK(process), line);189 dbus_test_task_print(DBUS_TEST_TASK(process), line);
170 g_free(line);190 g_free(line);
171 } while (G_IO_IN & g_io_channel_get_buffer_condition(channel));191 } while (G_IO_IN & g_io_channel_get_buffer_condition(channel));
@@ -190,7 +210,7 @@
190 argv = g_new0(gchar *, g_list_length(process->priv->parameters) + 2);210 argv = g_new0(gchar *, g_list_length(process->priv->parameters) + 2);
191211
192 argv[0] = process->priv->executable;212 argv[0] = process->priv->executable;
193 int i;213 guint i;
194 for (i = 0; i < g_list_length(process->priv->parameters); i++) {214 for (i = 0; i < g_list_length(process->priv->parameters); i++) {
195 argv[i + 1] = (gchar *)g_list_nth(process->priv->parameters, i)->data;215 argv[i + 1] = (gchar *)g_list_nth(process->priv->parameters, i)->data;
196 }216 }
@@ -224,13 +244,12 @@
224 g_free(message);244 g_free(message);
225 }245 }
226246
227 GIOChannel * iochan = g_io_channel_unix_new(proc_stdout);247 process->priv->io_chan = g_io_channel_unix_new(proc_stdout);
228 g_io_channel_set_buffer_size(iochan, 10 * 1024 * 1024); /* 10 MB should be enough for anyone */248 g_io_channel_set_buffer_size(process->priv->io_chan, 10 * 1024 * 1024); /* 10 MB should be enough for anyone */
229 process->priv->io_watch = g_io_add_watch(iochan,249 process->priv->io_watch = g_io_add_watch(process->priv->io_chan,
230 G_IO_IN, /* conditions */250 G_IO_IN, /* conditions */
231 proc_writes, /* func */251 proc_writes, /* func */
232 process); /* func data */252 process); /* func data */
233 g_io_channel_unref(iochan);
234253
235 process->priv->watcher = g_child_watch_add(process->priv->pid, proc_watcher, process);254 process->priv->watcher = g_child_watch_add(process->priv->pid, proc_watcher, process);
236255
237256
=== modified file 'libdbustest/service.c'
--- libdbustest/service.c 2012-04-23 03:39:53 +0000
+++ libdbustest/service.c 2012-10-02 21:09:33 +0000
@@ -106,7 +106,7 @@
106}106}
107107
108static void108static void
109task_unref (gpointer data, gpointer user_data)109task_unref (gpointer data, G_GNUC_UNUSED gpointer user_data)
110{110{
111 DbusTestTask * task = DBUS_TEST_TASK(data);111 DbusTestTask * task = DBUS_TEST_TASK(data);
112112
@@ -190,7 +190,7 @@
190}190}
191191
192DbusTestService *192DbusTestService *
193dbus_test_service_new (const gchar * address)193dbus_test_service_new (G_GNUC_UNUSED const gchar * address)
194{194{
195 DbusTestService * service = g_object_new(DBUS_TEST_TYPE_SERVICE,195 DbusTestService * service = g_object_new(DBUS_TEST_TYPE_SERVICE,
196 NULL);196 NULL);
@@ -296,7 +296,7 @@
296}296}
297297
298static void298static void
299task_starter (gpointer data, gpointer user_data)299task_starter (gpointer data, G_GNUC_UNUSED gpointer user_data)
300{300{
301 DbusTestTask * task = DBUS_TEST_TASK(data);301 DbusTestTask * task = DBUS_TEST_TASK(data);
302302
@@ -341,7 +341,7 @@
341}341}
342342
343static void343static void
344dbus_watcher (GPid pid, gint status, gpointer data)344dbus_watcher (GPid pid, G_GNUC_UNUSED gint status, gpointer data)
345{345{
346 DbusTestService * service = DBUS_TEST_SERVICE(data);346 DbusTestService * service = DBUS_TEST_SERVICE(data);
347 g_critical("DBus Daemon exited abruptly!");347 g_critical("DBus Daemon exited abruptly!");
@@ -495,7 +495,7 @@
495}495}
496496
497static void497static void
498task_state_changed (DbusTestTask * task, DbusTestTaskState state, gpointer user_data)498task_state_changed (G_GNUC_UNUSED DbusTestTask * task, G_GNUC_UNUSED DbusTestTaskState state, gpointer user_data)
499{499{
500 g_return_if_fail(DBUS_TEST_IS_SERVICE(user_data));500 g_return_if_fail(DBUS_TEST_IS_SERVICE(user_data));
501 DbusTestService * service = DBUS_TEST_SERVICE(user_data);501 DbusTestService * service = DBUS_TEST_SERVICE(user_data);
502502
=== modified file 'libdbustest/task.c'
--- libdbustest/task.c 2012-04-19 15:54:50 +0000
+++ libdbustest/task.c 2012-10-02 21:09:33 +0000
@@ -258,7 +258,7 @@
258}258}
259259
260static void260static void
261wait_for_found (GDBusConnection * connection, const gchar * name, const gchar * name_owner, gpointer user_data)261wait_for_found (G_GNUC_UNUSED GDBusConnection * connection, G_GNUC_UNUSED const gchar * name, G_GNUC_UNUSED const gchar * name_owner, gpointer user_data)
262{262{
263 g_return_if_fail(DBUS_TEST_IS_TASK(user_data));263 g_return_if_fail(DBUS_TEST_IS_TASK(user_data));
264 DbusTestTask * task = DBUS_TEST_TASK(user_data);264 DbusTestTask * task = DBUS_TEST_TASK(user_data);
265265
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-04-17 20:29:51 +0000
+++ src/Makefile.am 2012-10-02 21:09:33 +0000
@@ -6,7 +6,7 @@
6 $(COVERAGE_CFLAGS) \6 $(COVERAGE_CFLAGS) \
7 -I$(top_srcdir) \7 -I$(top_srcdir) \
8 -DDEFAULT_SESSION_CONF="\"$(datadir)/dbus-test-runner/session.conf\"" \8 -DDEFAULT_SESSION_CONF="\"$(datadir)/dbus-test-runner/session.conf\"" \
9 -Wall -Werror9 -Wall -Werror -Wextra
10dbus_test_runner_LDADD = $(DBUS_TEST_RUNNER_LIBS) \10dbus_test_runner_LDADD = $(DBUS_TEST_RUNNER_LIBS) \
11 $(top_builddir)/libdbustest/libdbustest.la11 $(top_builddir)/libdbustest/libdbustest.la
12dbus_test_runner_LDFLAGS = $(COVERAGE_LDFLAGS)12dbus_test_runner_LDFLAGS = $(COVERAGE_LDFLAGS)
1313
=== modified file 'src/dbus-test-runner.c'
--- src/dbus-test-runner.c 2012-04-18 21:46:08 +0000
+++ src/dbus-test-runner.c 2012-10-02 21:09:33 +0000
@@ -31,7 +31,7 @@
31#define NAME_SET "dbus-test-runner-name-set"31#define NAME_SET "dbus-test-runner-name-set"
3232
33static gboolean33static gboolean
34option_task (const gchar * arg, const gchar * value, gpointer data, GError ** error)34option_task (G_GNUC_UNUSED const gchar * arg, const gchar * value, G_GNUC_UNUSED gpointer data, G_GNUC_UNUSED GError ** error)
35{35{
36 if (last_task != NULL) {36 if (last_task != NULL) {
37 g_object_unref(last_task);37 g_object_unref(last_task);
@@ -44,7 +44,7 @@
44}44}
4545
46static gboolean46static gboolean
47option_taskname (const gchar * arg, const gchar * value, gpointer data, GError ** error)47option_taskname (G_GNUC_UNUSED const gchar * arg, const gchar * value, G_GNUC_UNUSED gpointer data, GError ** error)
48{48{
49 if (last_task == NULL) {49 if (last_task == NULL) {
50 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put the name %s on.", value);50 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put the name %s on.", value);
@@ -62,7 +62,7 @@
62}62}
6363
64static gboolean64static gboolean
65option_noreturn (const gchar * arg, const gchar * value, gpointer data, GError ** error)65option_noreturn (G_GNUC_UNUSED const gchar * arg, G_GNUC_UNUSED const gchar * value, G_GNUC_UNUSED gpointer data, GError ** error)
66{66{
67 if (last_task == NULL) {67 if (last_task == NULL) {
68 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put adjust return on.");68 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put adjust return on.");
@@ -79,7 +79,7 @@
79}79}
8080
81static gboolean81static gboolean
82option_invert (const gchar * arg, const gchar * value, gpointer data, GError ** error)82option_invert (G_GNUC_UNUSED const gchar * arg, G_GNUC_UNUSED const gchar * value, G_GNUC_UNUSED gpointer data, GError ** error)
83{83{
84 if (last_task == NULL) {84 if (last_task == NULL) {
85 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put adjust return on.");85 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put adjust return on.");
@@ -96,7 +96,7 @@
96}96}
9797
98static gboolean98static gboolean
99option_param (const gchar * arg, const gchar * value, gpointer data, GError ** error)99option_param (G_GNUC_UNUSED const gchar * arg, const gchar * value, G_GNUC_UNUSED gpointer data, GError ** error)
100{100{
101 if (last_task == NULL) {101 if (last_task == NULL) {
102 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put adjust return on.");102 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to put adjust return on.");
@@ -108,7 +108,7 @@
108}108}
109109
110static gboolean110static gboolean
111option_wait (const gchar * arg, const gchar * value, gpointer data, GError ** error)111option_wait (G_GNUC_UNUSED const gchar * arg, const gchar * value, G_GNUC_UNUSED gpointer data, GError ** error)
112{112{
113 if (last_task == NULL) {113 if (last_task == NULL) {
114 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to add a wait on %s for.", value);114 g_set_error(error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "No task to add a wait on %s for.", value);
@@ -125,7 +125,7 @@
125}125}
126126
127static gboolean127static gboolean
128max_wait_hit (gpointer user_data)128max_wait_hit (G_GNUC_UNUSED gpointer user_data)
129{129{
130 g_warning("Timing out at maximum wait of %d seconds.", max_wait);130 g_warning("Timing out at maximum wait of %d seconds.", max_wait);
131 dbus_test_service_stop(service);131 dbus_test_service_stop(service);
132132
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2012-06-21 14:28:38 +0000
+++ tests/Makefile.am 2012-10-02 21:09:33 +0000
@@ -147,10 +147,7 @@
147 @chmod +x $@147 @chmod +x $@
148XFAIL_TESTS += test-no-tasks148XFAIL_TESTS += test-no-tasks
149149
150# This test is failing on Jenkins for an unknown reason, we're disabiling150TESTS += test-output
151# to unblock Jenkins. Result tracked in LP: #1010739
152
153# TESTS += test-output
154test-output: Makefile.am151test-output: Makefile.am
155 @echo "#!/bin/sh -e" > $@152 @echo "#!/bin/sh -e" > $@
156 @echo "$(DBUS_RUNNER) --task cat --parameter \"$(top_srcdir)/src/dbus-test-runner.c\" --task-name \"cat1\" --task cat --parameter \"$(top_srcdir)/src/dbus-test-runner.c\" --task-name \"cat2\" > testcat.output.txt" >> $@153 @echo "$(DBUS_RUNNER) --task cat --parameter \"$(top_srcdir)/src/dbus-test-runner.c\" --task-name \"cat1\" --task cat --parameter \"$(top_srcdir)/src/dbus-test-runner.c\" --task-name \"cat2\" > testcat.output.txt" >> $@
@@ -173,7 +170,7 @@
173test-bustle: Makefile.am test-bustle.reference170test-bustle: Makefile.am test-bustle.reference
174 @echo "#!/bin/sh -e" > $@171 @echo "#!/bin/sh -e" > $@
175 @echo $(DBUS_RUNNER) --bustle-data \"$(builddir)/test-bustle.bustle\" --task $(srcdir)/test-bustle-list.sh >> $@172 @echo $(DBUS_RUNNER) --bustle-data \"$(builddir)/test-bustle.bustle\" --task $(srcdir)/test-bustle-list.sh >> $@
176 @echo "grep ^mc \"$(builddir)/test-bustle.bustle\" | grep ":1.1" | grep "ListNames" | cut -f 5-9 > test-bustle.filtered" >> $@173 @echo "grep ^sig \"$(builddir)/test-bustle.bustle\" | grep ":1.1" | grep "com.launchpad.dbustestrunner" | cut -f 5-9 > test-bustle.filtered" >> $@
177 @echo "diff \"$(srcdir)/test-bustle.reference\" \"$(builddir)/test-bustle.filtered\"" >> $@174 @echo "diff \"$(srcdir)/test-bustle.reference\" \"$(builddir)/test-bustle.filtered\"" >> $@
178 @chmod +x $@175 @chmod +x $@
179DISTCLEANFILES += test-bustle.bustle test-bustle.filtered176DISTCLEANFILES += test-bustle.bustle test-bustle.filtered
@@ -216,7 +213,8 @@
216 @echo "--task $(srcdir)/test-bustle-list.sh \\" >> $@213 @echo "--task $(srcdir)/test-bustle-list.sh \\" >> $@
217 @echo "--task $(srcdir)/test-bustle-list.sh \\" >> $@214 @echo "--task $(srcdir)/test-bustle-list.sh \\" >> $@
218 @echo "--task $(srcdir)/test-bustle-list.sh \\" >> $@215 @echo "--task $(srcdir)/test-bustle-list.sh \\" >> $@
219 @echo "--task $(srcdir)/test-bustle-list.sh \\" >> $@216 @echo "--task $(srcdir)/test-bustle-list.sh" >> $@
217 @echo "$(srcdir)/test-bustle-data-check.sh \"$(builddir)/test-bustle-data.bustle\" 12" >> $@
220 @chmod +x $@218 @chmod +x $@
221DISTCLEANFILES += test-bustle-data.bustle219DISTCLEANFILES += test-bustle-data.bustle
222220
@@ -310,4 +308,5 @@
310EXTRA_DIST = \308EXTRA_DIST = \
311 delayrm.sh \309 delayrm.sh \
312 test-bustle.reference \310 test-bustle.reference \
311 test-bustle-data-check.sh \
313 test-bustle-list.sh312 test-bustle-list.sh
314313
=== added file 'tests/test-bustle-data-check.sh'
--- tests/test-bustle-data-check.sh 1970-01-01 00:00:00 +0000
+++ tests/test-bustle-data-check.sh 2012-10-02 21:09:33 +0000
@@ -0,0 +1,3 @@
1#!/bin/bash -e
2
3[ `grep ^sig $1 | grep dbustestrunner | wc -l` -eq $2 ]
04
=== modified file 'tests/test-bustle-list.sh'
--- tests/test-bustle-list.sh 2011-01-28 14:58:51 +0000
+++ tests/test-bustle-list.sh 2012-10-02 21:09:33 +0000
@@ -1,3 +1,3 @@
1#!/bin/sh1#!/bin/sh
2sleep 12sleep 1
3dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ListNames3gdbus emit --session --object-path /test/dbustestrunner/signal --signal com.launchpad.dbustestrunner.signal
44
=== modified file 'tests/test-bustle.reference'
--- tests/test-bustle.reference 2009-12-08 05:22:06 +0000
+++ tests/test-bustle.reference 2012-10-02 21:09:33 +0000
@@ -1,1 +1,1 @@
1:1.1 org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ListNames1:1.1 /test/dbustestrunner/signal com.launchpad.dbustestrunner signal

Subscribers

People subscribed via source and target branches