testing fix

Kkevsterrr · Jan 4, 2017 · 3c5f286 · 3c5f286
1 parent 464d426
commit 3c5f286
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,4 +3,4 @@ python:
  - "3.5"
 install:
  - pip install -r requirements.txt
-script: nosetests-3.4 -vv --nocapture --ignore-file tests/tests.py
+script: nosetests -s -vv tests/tests.py --nocapture --exclude-dir="tests/incomplete"
diff --git a/requirements.txt b/requirements.txt
@@ -14,4 +14,5 @@ rpyc==3.3.0
 scp==0.10.2
 six==1.10.0
 pexpect
-netifaces
+netifaces
+nose-exclude
diff --git a/tests/containers.py → tests/incomplete/containers.py b/tests/containers.py → tests/incomplete/containers.py
diff --git a/tests/stats.py → tests/incomplete/stats.py b/tests/stats.py → tests/incomplete/stats.py
diff --git a/tests/test.py → tests/incomplete/test.py b/tests/test.py → tests/incomplete/test.py
diff --git a/tests/tests.py b/tests/tests.py
@@ -1,6 +1,6 @@
 from master import *
 from nose.tools import nottest
-import pexpect
+
 #######################################################################################
 
 @nottest
@@ -58,13 +58,15 @@ def check_crash_test(bd):
     core = BackdoorMe()
     bd(core).do_show("options")
     pass
+
 @nottest
 def check_help_text(bd):
     core = BackdoorMe()
     if bd(core).help_text == "":
         assert False
 
 #######################################################################################
+
 def backdoor_crash_test():
     bds = get_backdoors()
     for bd in bds:
@@ -75,17 +77,13 @@ def add_module_test():
     for bd in bds:
         for m in get_modules():
             yield check_add_module_test, bd, m
+
 def help_text_test():
     bds = get_backdoors()
     for bd in bds:
        yield check_help_text, bd 
+
 def add_target_test():
     bd = BackdoorMe()
     bd.addtarget("10.1.0.2", "student", "target123")
-
     pass
-
-@nottest
-def testPyth():
-    child = pexpect.spawn('python master.py')
-    child.expect('Welcome to BackdoorMe')