h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-19 18:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

dup2_list_t::resolve_chain to stop returning maybe

Browse Source 
It can no longer fail.
This commit is contained in:
ridiculousfish
2019-12-29 14:49:05 -08:00
parent 94dcd1cc07
commit b784a0caa3
4 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/fish_tests.cpp
View File

@@ -2462,14 +2462,13 @@ static void test_dup2s() {
chain.push_back(make_shared<io_close_t>(17));
chain.push_back(make_shared<io_fd_t>(3, 19));
auto list = dup2_list_t::resolve_chain(chain);
do_test(list.has_value());
do_test(list->get_actions().size() == 2);
do_test(list.get_actions().size() == 2);
auto act1 = list->get_actions().at(0);
auto act1 = list.get_actions().at(0);
do_test(act1.src == 17);
do_test(act1.target == -1);
auto act2 = list->get_actions().at(1);
auto act2 = list.get_actions().at(1);
do_test(act2.src == 19);
do_test(act2.target == 3);
}
@@ -2485,17 +2484,16 @@ static void test_dup2s_fd_for_target_fd() {
chain.push_back(make_shared<io_fd_t>(3, 5));
auto list = dup2_list_t::resolve_chain(chain);
do_test(list.has_value());
do_test(list->fd_for_target_fd(3) == 8);
do_test(list->fd_for_target_fd(5) == 8);
do_test(list->fd_for_target_fd(8) == 8);
do_test(list->fd_for_target_fd(1) == 4);
do_test(list->fd_for_target_fd(4) == 4);
do_test(list->fd_for_target_fd(100) == 100);
do_test(list->fd_for_target_fd(0) == 0);
do_test(list->fd_for_target_fd(-1) == -1);
do_test(list->fd_for_target_fd(9) == -1);
do_test(list->fd_for_target_fd(10) == -1);
do_test(list.fd_for_target_fd(3) == 8);
do_test(list.fd_for_target_fd(5) == 8);
do_test(list.fd_for_target_fd(8) == 8);
do_test(list.fd_for_target_fd(1) == 4);
do_test(list.fd_for_target_fd(4) == 4);
do_test(list.fd_for_target_fd(100) == 100);
do_test(list.fd_for_target_fd(0) == 0);
do_test(list.fd_for_target_fd(-1) == -1);
do_test(list.fd_for_target_fd(9) == -1);
do_test(list.fd_for_target_fd(10) == -1);
}
/// Testing colors.