Fix tests a bit more

This commit is contained in:
def
2015-03-10 15:34:15 +01:00
parent 573fa9b891
commit 69e2b61c0a
5 changed files with 13 additions and 13 deletions

View File

@@ -3,7 +3,7 @@ discard """
WARNING: false first assertion from bar
ERROR: false second assertion from bar
-1
tfailedassert.nim:27 false assertion from foo
tests/assert/tfailedassert.nim:27 false assertion from foo
'''
"""

View File

@@ -8,8 +8,8 @@ const
PARAM_BACKGROUND = @["-b", "--background"]
PARAM_OUTPUT = @["-o", "--output"]
PARAM_NO_CLOBBER = @["-nc", "--no-clobber"]
PARAM_PROGRESS = "--progress"
PARAM_NO_PROXY = "--no-proxy"
PARAM_PROGRESS = @["--progress"]
PARAM_NO_PROXY = @["--no-proxy"]
template P(tnames: varargs[string], thelp: string, ttype = PK_EMPTY,
@@ -77,8 +77,8 @@ proc process_commandline(): Tcommandline_results =
quit()
echo "Will download to $1" % [result.options[PARAM_OUTPUT[0]].str_val]
if result.options.hasKey(PARAM_PROGRESS):
echo "Will use progress type $1" % [result.options[PARAM_PROGRESS].str_val]
if result.options.hasKey(PARAM_PROGRESS[0]):
echo "Will use progress type $1" % [result.options[PARAM_PROGRESS[0]].str_val]
when isMainModule:

View File

@@ -1,11 +1,11 @@
discard """
file: "tests/reject/trecincb.nim"
line: 9
errormsg: "recursive dependency: 'trecincb.nim'"
errormsg: "recursive dependency: 'tests/modules/trecincb.nim'"
"""
# Test recursive includes
include trecincb #ERROR_MSG recursive dependency: 'tests/trecincb.nim'
include trecincb
echo "trecina"

View File

@@ -1,12 +1,12 @@
discard """
file: "trecincb.nim"
line: 9
errormsg: "recursive dependency: 'trecincb.nim'"
errormsg: "recursive dependency: 'tests/modules/trecincb.nim'"
"""
# Test recursive includes
include trecincb #ERROR_MSG recursive dependency: 'tests/trecincb.nim'
include trecincb
echo "trecinb"

View File

@@ -65,13 +65,13 @@ proc testGetFileInfo =
try:
discard getFileInfo(testFile)
#echo("Handle : Valid File : Success")
except EIO:
except IOError:
echo("Handle : Valid File : Failure")
try:
discard getFileInfo(testHandle)
#echo("Handle : Valid File : Success")
except EIO:
except IOError:
echo("Handle : Valid File : Failure")
# Case 6 and 8
@@ -82,14 +82,14 @@ proc testGetFileInfo =
try:
discard getFileInfo(testFile)
echo("Handle : Invalid File : Failure")
except EIO, EOS:
except IOError, OSError:
discard
#echo("Handle : Invalid File : Success")
try:
discard getFileInfo(testHandle)
echo("Handle : Invalid File : Failure")
except EIO, EOS:
except IOError, OSError:
discard
#echo("Handle : Invalid File : Success")