Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions tests/yanglint/interactive/add.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ test add_basic {} {
ly_cmd "list" "I modleafref\r.*I modleaf"
}}

test add_disable_searchdir_once {add --disable-searchdir} {
-setup $ly_setup -cleanup $ly_cleanup -constraints {!ctest} -body {
ly_cmd "add $mdir/modimp-cwd.yang"
ly_cmd "clear"
ly_cmd_err "add -D $mdir/modimp-cwd.yang" "not found in local searchdirs"
}}

test add_disable_searchdir_twice {add -D -D} {
-setup $ly_setup -cleanup $ly_cleanup -constraints {!ctest} -body {
ly_cmd "add $mdir/ietf-ip.yang"
Expand Down
2 changes: 1 addition & 1 deletion tests/yanglint/interactive/list.test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source [expr {[info exists ::env(TESTS_DIR)] ? "$env(TESTS_DIR)/interactive/ly.tcl" : "ly.tcl"}]
namespace import uti::regex_xml_elements uti::regex_json_pairs

set modules {ietf-yang-library ietf-inet-types}
set modules {ietf-inet-types ietf-yang-library}

test list_basic {basic test} {
-setup $ly_setup -cleanup $ly_cleanup -body {
Expand Down
8 changes: 0 additions & 8 deletions tests/yanglint/modules/modimp-cwd.yang

This file was deleted.

7 changes: 0 additions & 7 deletions tests/yanglint/non-interactive/disabled_searchdir.test
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ source [expr {[info exists ::env(TESTS_DIR)] ? "$env(TESTS_DIR)/non-interactive/

set mdir $env(YANG_MODULES_DIR)

# Test should be skipped if called by ctest.
test disable_searchdir_once {Unsuccessfully imports module due to disabled cwd searching} {
-constraints {!ctest} -body {
ly_cmd "$mdir/modimp-cwd.yang"
ly_cmd_err "-D $mdir/modimp-cwd.yang" "not found in local searchdirs"
}}

test disable_searchdir_twice {Unsuccessfully imports module due to -D -D} {
ly_cmd "$mdir/ietf-ip.yang"
ly_cmd_err "-D -D $mdir/ietf-ip.yang" "Loading \"ietf-interfaces\" module failed."
Expand Down
2 changes: 1 addition & 1 deletion tests/yanglint/non-interactive/list.test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source [expr {[info exists ::env(TESTS_DIR)] ? "$env(TESTS_DIR)/non-interactive/ly.tcl" : "ly.tcl"}]
namespace import uti::regex_xml_elements uti::regex_json_pairs

set modules {ietf-yang-library ietf-inet-types}
set modules {ietf-inet-types ietf-yang-library}

test list_basic {} {
ly_cmd "-l" "ietf-yang-types"
Expand Down