Skip to content

Commit

Permalink
Merge pull request #177 from ghantoos/b/fix_tox_tests
Browse files Browse the repository at this point in the history
Correct tox tests, minor typos
  • Loading branch information
ghantoos committed Sep 15, 2017
2 parents ea4611c + de6a902 commit 6684681
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lshell/shellcmd.py
Expand Up @@ -394,7 +394,7 @@ def onecmd(self, line):
""" This method overrides the original onecmd method, to put the cmd,
arg and line variables in class global variables: self.g_cmd,
self.g_arg and self.g_line.
Thos variables are then used by the __getattr__ method
Those variables are then used by the __getattr__ method
"""
cmd, arg, line = self.parseline(line)
self.g_cmd, self.g_arg, self.g_line = [cmd, arg, line]
Expand Down Expand Up @@ -453,7 +453,7 @@ def _timererror(self, signum, frame):


class LshellTimeOut(Exception):
""" Custum exception used for timer timeout
""" Custom exception used for timer timeout
"""

def __init__(self, value="Timed Out"):
Expand Down
1 change: 1 addition & 0 deletions test/test_functional.py
Expand Up @@ -445,5 +445,6 @@ def test_31_disable_exit(self):

self.assertIn(expected, result)


if __name__ == '__main__':
unittest.main()
1 change: 1 addition & 0 deletions test/test_unit.py
Expand Up @@ -226,5 +226,6 @@ def test_28_checksecure_quoted_command(self):
INPUT = "echo'/1.sh'"
return self.assertEqual(sec.check_secure(INPUT, self.userconf)[0], 1)


if __name__ == "__main__":
unittest.main()
7 changes: 7 additions & 0 deletions test/words
Expand Up @@ -58,3 +58,10 @@ sys
tuples
sigterm
init
ignace
mouzannar
alojzij
blatnik
custom
linux
thos

0 comments on commit 6684681

Please sign in to comment.