diff options
| author | Timothee Cour <timothee.cour2@gmail.com> | 2020-03-20 08:39:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 16:39:55 +0100 |
| commit | 1d665adecde3b3bf16e64068e83c0b3cb0171856 (patch) | |
| tree | 5081cb220073d43212c968af5861dfe3e3b0df4e /tests | |
| parent | 8215c576664e0bd689c16739f72d5b79cf302ec8 (diff) | |
| download | Nim-1d665adecde3b3bf16e64068e83c0b3cb0171856.tar.gz | |
[RFC] 'walkDir' now has a new 'checkDir' flag, to mimic behaviour of other languages (#13642)
Co-authored-by: narimiran
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/newconfig/tfoo.nims | 11 | ||||
| -rw-r--r-- | tests/stdlib/tos.nim | 20 |
2 files changed, 18 insertions, 13 deletions
diff --git a/tests/newconfig/tfoo.nims b/tests/newconfig/tfoo.nims index 8dcc7d6f1..9e6405a27 100644 --- a/tests/newconfig/tfoo.nims +++ b/tests/newconfig/tfoo.nims @@ -24,8 +24,10 @@ doAssert(existsEnv("dummy") == false) # issue #7283 putEnv("dummy", "myval") -doAssert(existsEnv("dummy") == true) +doAssert(existsEnv("dummy")) doAssert(getEnv("dummy") == "myval") +delEnv("dummy") +doAssert(existsEnv("dummy") == false) # issue #7393 let wd = getCurrentDir() @@ -64,6 +66,8 @@ else: assert toDll("nim") == "libnim.so" rmDir("tempXYZ") +doAssertRaises(OSError): + rmDir("tempXYZ", checkDir = true) assert dirExists("tempXYZ") == false mkDir("tempXYZ") assert dirExists("tempXYZ") == true @@ -81,8 +85,3 @@ when false: rmDir("tempXYZ") assert dirExists("tempXYZ") == false - -putEnv("dummy", "myval") -doAssert(existsEnv("dummy") == true) -delEnv("dummy") -doAssert(existsEnv("dummy") == false) diff --git a/tests/stdlib/tos.nim b/tests/stdlib/tos.nim index d713bfe0c..be5384015 100644 --- a/tests/stdlib/tos.nim +++ b/tests/stdlib/tos.nim @@ -163,13 +163,19 @@ block walkDirRec: removeDir("walkdir_test") -when not defined(windows): - block walkDirRelative: - createDir("walkdir_test") - createSymlink(".", "walkdir_test/c") - for k, p in walkDir("walkdir_test", true): - doAssert k == pcLinkToDir - removeDir("walkdir_test") +block: # walkDir + doAssertRaises(OSError): + for a in walkDir("nonexistant", checkDir = true): discard + doAssertRaises(OSError): + for p in walkDirRec("nonexistant", checkDir = true): discard + + when not defined(windows): + block walkDirRelative: + createDir("walkdir_test") + createSymlink(".", "walkdir_test/c") + for k, p in walkDir("walkdir_test", true): + doAssert k == pcLinkToDir + removeDir("walkdir_test") block normalizedPath: doAssert normalizedPath("") == "" |