nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2859 from stapelberg/fixtests 

Fix tests
This commit is contained in:
Ingo Bürk 2017-08-19 18:19:51 +02:00 committed by GitHub
parent e4da07e734 5738ea10bb
commit 65dde35bbf
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
i3bar/src/xcb.c
View File

@ -1184,6 +1184,7 @@ void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) {
case XCB_CONFIGURE_REQUEST: case XCB_CONFIGURE_REQUEST:
/* ConfigureRequest, sent by a tray child */ /* ConfigureRequest, sent by a tray child */
handle_configure_request((xcb_configure_request_event_t *)event); handle_configure_request((xcb_configure_request_event_t *)event);
break;
case XCB_RESIZE_REQUEST: case XCB_RESIZE_REQUEST:
/* ResizeRequest sent by a tray child using override_redirect. */ /* ResizeRequest sent by a tray child using override_redirect. */
handle_resize_request((xcb_resize_request_event_t *)event); handle_resize_request((xcb_resize_request_event_t *)event);

8
testcases/t/171-config-migrate.t
View File

@ -153,7 +153,7 @@ ok(line_exists($output, qr|^bindsym Mod1\+s restart$|), 'restart unchanged');
ok(line_exists($output, qr|^bindsym Mod1\+s reload$|), 'reload unchanged'); ok(line_exists($output, qr|^bindsym Mod1\+s reload$|), 'reload unchanged');
ok(line_exists($output, qr|^bindsym Mod1\+s exit$|), 'exit unchanged'); ok(line_exists($output, qr|^bindsym Mod1\+s exit$|), 'exit unchanged');
ok(line_exists($output, qr|^bindcode Mod1\+c exec /usr/bin/urxvt$|), 'bind changed to bindcode'); ok(line_exists($output, qr|^bindcode Mod1\+c exec /usr/bin/urxvt$|), 'bind changed to bindcode');
ok(line_exists($output, qr|^mode "asdf" {$|), 'mode asdf unchanged'); ok(line_exists($output, qr|^mode "asdf" \{$|), 'mode asdf unchanged');
ok(line_exists($output, qr|^bindcode 36 mode \"default\"$|), 'mode default unchanged'); ok(line_exists($output, qr|^bindcode 36 mode \"default\"$|), 'mode default unchanged');
ok(line_exists($output, qr|^}$|), 'closing mode bracket still there'); ok(line_exists($output, qr|^}$|), 'closing mode bracket still there');
@ -336,13 +336,13 @@ ok(line_exists($output, qr|^bindsym Mod1\+3 move container to workspace work|),
##################################################################### #####################################################################
$output = migrate_config(''); $output = migrate_config('');
ok(line_exists($output, qr|bar {|), 'i3bar added'); ok(line_exists($output, qr|bar \{|), 'i3bar added');
$output = migrate_config('workspace_bar enable'); $output = migrate_config('workspace_bar enable');
ok(line_exists($output, qr|bar {|), 'i3bar added'); ok(line_exists($output, qr|bar \{|), 'i3bar added');
$output = migrate_config('workspace_bar no'); $output = migrate_config('workspace_bar no');
ok(!line_exists($output, qr|bar {|), 'no i3bar added'); ok(!line_exists($output, qr|bar \{|), 'no i3bar added');
##################################################################### #####################################################################
# check whether the mode command gets quotes # check whether the mode command gets quotes