Refactor tests (threat9#332)

* Move tests to tests/ directory * Remove unused `tox.ini` file * Add flake8 compliance * Add `lint` target to `tests` target in the Makefile
devkw · Oct 21, 2017 · bbbf791 · bbbf791
1 parent 550bcf4
commit bbbf791
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 136 deletions.
diff --git a/.travis/run.sh b/.travis/run.sh
@@ -10,4 +10,4 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     source ~/.venv/bin/activate
 fi
 
-make tests lint
+make lint tests
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ run:
 	docker run -it --rm $(RSF_IMAGE)
 
 lint:
-	flake8 --exclude=__init__.py --ignore=$(FLAKE8_IGNORED_RULES) $(MODULES)
+	flake8 --exclude=__init__.py --ignore=$(FLAKE8_IGNORED_RULES) tests $(MODULES)
 
 tests: clean
 ifeq ($(MODULES), routersploit)

diff --git a/routersploit/test/__init__.py b/routersploit/test/__init__.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/routersploit/test/test_case.py → tests/test_case.py b/routersploit/test/test_case.py → tests/test_case.py
@@ -1,9 +1,8 @@
-import unittest
 import logging
+import unittest
 
 from routersploit.utils import NonStringIterable
 
-
 logging.getLogger().addHandler(logging.NullHandler())
 
 
@@ -17,7 +16,8 @@ def assertIsDecorated(self, function, decorator_name):
         self.assertIn(
             decorator_name,
             decorator_list,
-            msg="'{}' method should be decorated with 'module_required'".format(function.__name__)
+            msg="'{}' method should be decorated "
+                "with 'module_required'".format(function.__name__)
         )
 
     def assertIsSubset(self, subset, container):

diff --git a/routersploit/test/test_completer.py → tests/test_completer.py b/routersploit/test/test_completer.py → tests/test_completer.py
@@ -1,18 +1,20 @@
-import unittest
 import os
+import unittest
 
 import pexpect
 
-from routersploit.test import RoutersploitTestCase
+from tests.test_case import RoutersploitTestCase
 
 
 class RoutersploitCompleterTest(RoutersploitTestCase):
-
     def __init__(self, methodName='runTest'):
         super(RoutersploitCompleterTest, self).__init__(methodName)
-        self.cli_path = os.path.abspath(os.path.join(__file__, os.pardir, os.pardir, os.pardir, 'rsf.py'))
+        self.cli_path = os.path.abspath(
+            os.path.join(__file__, os.pardir, os.pardir, 'rsf.py')
+        )
         self.raw_prompt = "\033[4mrsf\033[0m > "
-        self.module_prompt = lambda x: "\033[4mrsf\033[0m (\033[91m{}\033[0m) > ".format(x)
+        self.module_prompt = lambda \
+            x: "\033[4mrsf\033[0m (\033[91m{}\033[0m) > ".format(x)
 
     def setUp(self):
         self.rsf = pexpect.spawn('python {}'.format(self.cli_path))
@@ -32,7 +34,9 @@ def set_module(self):
 
     def test_raw_commands_no_module(self):
         self.rsf.send("\t\t")
-        self.assertPrompt('exec     exit     help     search   show     use      \r\n', self.raw_prompt)
+        self.assertPrompt(
+            'exec     exit     help     search   show     use      \r\n',
+            self.raw_prompt)
 
     def test_complete_use_raw(self):
         self.rsf.send("u\t\t")
@@ -249,7 +253,8 @@ def test_complete_show(self):
         self.set_module()
         self.rsf.send("show \t\t")
         self.assertPrompt(
-            'all       creds     devices   exploits  info      options   scanners\r\n',
+            'all       creds     devices   exploits  '
+            'info      options   scanners\r\n',
             self.module_prompt('FTP Bruteforce')
         )
 

diff --git a/routersploit/test/test_exploits.py → tests/test_exploits.py b/routersploit/test/test_exploits.py → tests/test_exploits.py
@@ -1,13 +1,10 @@
-import unittest
 import os
+import unittest
 
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import mock
 
-from routersploit.test import RoutersploitTestCase
-from routersploit.exploits import Exploit, Option, GLOBAL_OPTS
+from routersploit.exploits import Exploit, GLOBAL_OPTS, Option
+from tests.test_case import RoutersploitTestCase
 
 
 def suffix(x):
@@ -29,8 +26,10 @@ class TestExploitBar(Exploit):
 
 
 class TestExploitWithValidators(Exploit):
-    doo = Option(default="default_value", description="description_three", validators=suffix)
-    paa = Option(default="default_value", description="description_three", validators=(suffix, SUFFIX))
+    doo = Option(default="default_value", description="description_three",
+                 validators=suffix)
+    paa = Option(default="default_value", description="description_three",
+                 validators=(suffix, SUFFIX))
 
 
 class OptionTest(RoutersploitTestCase):
@@ -66,7 +65,8 @@ def test_if_validator_is_applied_after_setting_value(self):
 
     def test_if_validator_is_applied_in_specific_order(self):
         self.exploit_with_validators.paa = "new_value"
-        self.assertEqual(self.exploit_with_validators.paa, "new_value_suffix_SUFFIX")
+        self.assertEqual(self.exploit_with_validators.paa,
+                         "new_value_suffix_SUFFIX")
 
     def test_if_exploit_option_is_picked_up_before_global(self):
         GLOBAL_OPTS['doo'] = 'global_doo'
@@ -85,9 +85,11 @@ def test_if_validators_are_applied_on_global_options(self):
         self.assertEqual(self.exploit_with_validators.doo, 'global_doo_suffix')
 
     def test_str_representation(self):
-        with mock.patch.object(TestExploitFoo, "__module__", new_callable=mock.PropertyMock) as mock_module:
+        with mock.patch.object(TestExploitFoo, "__module__",
+                               new_callable=mock.PropertyMock) as mock_module:
             mock_module.return_value = "routersploit.modules.exploits.foo.bar"
-            self.assertEqual(str(TestExploitFoo()), os.path.join('exploits', 'foo', 'bar'))
+            self.assertEqual(str(TestExploitFoo()),
+                             os.path.join('exploits', 'foo', 'bar'))
 
     def test_exploit_options_property(self):
         self.assertEqual(self.exploit_bar.options, ['paa', 'target', 'doo'])