BAMF

Merge lp:~kamstrup/bamf/fail-on-FAIL into lp:bamf/0.4

  1. fail-on-FAIL
  2. Merge into 0.4
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 424
Merged at revision: 421
Proposed branch: lp:~kamstrup/bamf/fail-on-FAIL
Merge into: lp:bamf/0.4
Diff against target: 88 lines (+13/-12)
4 files modified
src/bamf-legacy-window.c (+3/-0)
src/bamf-view.c (+0/-2)
tests/bamfdaemon/Makefile.am (+5/-5)
tests/libbamf/Makefile.am (+5/-5)
To merge this branch: bzr merge lp:~kamstrup/bamf/fail-on-FAIL
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Jason Smith (community) Approve
Review via email: mp+83601@code.launchpad.net

Description of the change

Bugfix:

 * Add missing guard checking if the legacy WnckWindow is != NULL in bamf_legacy_window_save_mini_icon(). This fixes the tests /Application/ManagesXid and /Application/Xids when running headless

Fixes for headless test mode:

 * Properly exit if any tests report errors during 'make check' when running in headless mode
 * Remove debug spew when running tests "Export path: %s\n"
 * Remove unused variable TEST_RESULTS from test Makefile.ams

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

seems rather obvious on seeing it, well caught

review: Approve
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Just uploaded some more fixes that should fix the headless mode on the build bots:

 * Remove unused variable TEST_RESULTS from test Makefile.ams

 * Remove debug spew when running tests "Export path: %s\n"

 * Add missing guard checking if the legacy WnckWindow is != NULL in bamf_legacy_window_save_mini_icon(). This fixes the tests /Application/ManagesXid and /Application/Xids

Please re-review

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Approving latest commit, looks good, let's test this :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c 2011-09-26 11:44:10 +0000
+++ src/bamf-legacy-window.c 2011-11-29 08:12:24 +0000
@@ -215,6 +215,9 @@
215 215
216 window = self->priv->legacy_window;216 window = self->priv->legacy_window;
217 217
218 if (!window)
219 return NULL;
220
218 if (wnck_window_get_icon_is_fallback (window))221 if (wnck_window_get_icon_is_fallback (window))
219 return NULL;222 return NULL;
220 223
221224
=== modified file 'src/bamf-view.c'
--- src/bamf-view.c 2011-08-01 23:25:01 +0000
+++ src/bamf-view.c 2011-11-29 08:12:24 +0000
@@ -462,8 +462,6 @@
462 path = g_strdup_printf ("%s/%s", BAMF_DBUS_PATH, stable_name);462 path = g_strdup_printf ("%s/%s", BAMF_DBUS_PATH, stable_name);
463 g_free (stable_name);463 g_free (stable_name);
464464
465 g_print ("Export Path: %s\n", path);
466
467 BAMF_VIEW_GET_CLASS (view)->names = g_list_prepend (BAMF_VIEW_GET_CLASS (view)->names, path);465 BAMF_VIEW_GET_CLASS (view)->names = g_list_prepend (BAMF_VIEW_GET_CLASS (view)->names, path);
468466
469 view->priv->path = path;467 view->priv->path = path;
470468
=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am 2011-11-28 10:17:05 +0000
+++ tests/bamfdaemon/Makefile.am 2011-11-29 08:12:24 +0000
@@ -109,21 +109,21 @@
109DISPLAY = :27109DISPLAY = :27
110LOG_PATH = headless-logs110LOG_PATH = headless-logs
111test-headless:111test-headless:
112 set -e; \
112 export DISPLAY=$(DISPLAY); \113 export DISPLAY=$(DISPLAY); \
113 rm -rf $(LOG_PATH); \114 rm -rf $(LOG_PATH); \
114 mkdir $(LOG_PATH); \115 mkdir $(LOG_PATH); \
115 $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/_Xvfb.out 2>&1 & \116 $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
116 sleep 1; \117 sleep 1; \
117 \118 \
118 $(DBUS_LAUNCH) > $(LOG_PATH)/_sessionbus.sh; \119 $(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
119 source $(LOG_PATH)/_sessionbus.sh; \120 source $(LOG_PATH)/sessionbus.sh; \
120 sleep 1; \121 sleep 1; \
121 \122 \
122 make test; \123 make test; \
123 TEST_RESULTS=$?; \
124 sleep 1; \124 sleep 1; \
125 \125 \
126 kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/_sessionbus.sh | grep -oE '[0-9]+'`; \126 kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
127 pkill Xvfb;127 pkill Xvfb;
128 128
129endif129endif
130130
=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am 2011-11-28 10:17:05 +0000
+++ tests/libbamf/Makefile.am 2011-11-29 08:12:24 +0000
@@ -65,21 +65,21 @@
65DISPLAY = :2765DISPLAY = :27
66LOG_PATH = headless-logs66LOG_PATH = headless-logs
67test-headless:67test-headless:
68 set -e; \
68 export DISPLAY=$(DISPLAY); \69 export DISPLAY=$(DISPLAY); \
69 rm -rf $(LOG_PATH); \70 rm -rf $(LOG_PATH); \
70 mkdir $(LOG_PATH); \71 mkdir $(LOG_PATH); \
71 $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/_Xvfb.out 2>&1 & \72 $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
72 sleep 1; \73 sleep 1; \
73 \74 \
74 $(DBUS_LAUNCH) > $(LOG_PATH)/_sessionbus.sh; \75 $(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
75 source $(LOG_PATH)/_sessionbus.sh; \76 source $(LOG_PATH)/sessionbus.sh; \
76 sleep 1; \77 sleep 1; \
77 \78 \
78 make test; \79 make test; \
79 TEST_RESULTS=$?; \
80 sleep 1; \80 sleep 1; \
81 \81 \
82 kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/_sessionbus.sh | grep -oE '[0-9]+'`; \82 kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
83 pkill Xvfb;83 pkill Xvfb;
84 84
85endif85endif

Subscribers

People subscribed via source and target branches