Finished changing it to work properly with setup.py.

Changed the tests to include the proper namespace along with being able to
run the tests by using `python setup.py test`.

Author: ccsplit

README.md

@@ -104,4 +104,11 @@ pip install -r test-requirements.txt
 pytest
 ```
 
+Or you can optionally run:
+
+```bash
+pip install -r test-requirements.txt
+python setup.py test
+```
+
 If you're thinking of adding a new feature to the project, consider also contributing with a couple of tests. A well-tested codebase is a sane codebase. :)

setup.cfg

@@ -0,0 +1,2 @@
+[aliases]
+test=pytest

setup.py

@@ -27,5 +27,6 @@ def dependencies(file):
             ]
         },
         install_requires=dependencies('requirements.txt'),
+        setup_requires=['pytest-runner'],
         tests_require=dependencies('test-requirements.txt'),
         include_package_data=True)

VHostScan/tests/__init__.py renamed to tests/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 from collections import namedtuple
-from lib.helpers.file_helper import parse_word_list_argument, get_combined_word_lists
+from VHostScan.lib.helpers.file_helper import parse_word_list_argument, get_combined_word_lists
 
 WORDLIST_FILES = {
     'simpsons': ['marge', 'bart', 'homer', 'lisa', 'maggie'],

VHostScan/tests/conftest.py renamed to tests/conftest.py

@@ -2,8 +2,8 @@
 import pytest
 from unittest.mock import patch
 
-from lib.helpers.wordlist_helper import WordList
-from lib.helpers.wordlist_helper import DEFAULT_WORDLIST_FILE
+from VHostScan.lib.helpers.wordlist_helper import WordList
+from VHostScan.lib.helpers.wordlist_helper import DEFAULT_WORDLIST_FILE
 
 
 @pytest.fixture(scope='class')
@@ -28,7 +28,7 @@ def test_get_wordlist_from_stdin(self):
         stdin_wordlist = ['keyword1', 'keyword1']
         expected_wordlist = []
         expected_wordlist.extend(stdin_wordlist)
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist()
             self.assertEqual(wordlist, expected_wordlist)
 
@@ -37,59 +37,59 @@ def test_get_wordlist_from_stdin_and_wordlist(self):
         expected_wordlist = []
         expected_wordlist.extend(stdin_wordlist)
         expected_wordlist.extend(self.user_wordlist)
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist(self.user_wordlist_file)
             self.assertEqual(wordlist, expected_wordlist)
 
     def test_using_default_wordlist(self):
         stdin_wordlist = []
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist()
             self.assertEqual(wordlist, self.default_wordlist)
 
     def test_ip_using_prefix(self):
         stdin_wordlist = ['127.0.0.1']
         prefix = 'dev-'
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist(None, prefix)
             self.assertEqual(wordlist, stdin_wordlist)
 
     def test_ip_using_suffix(self):
         stdin_wordlist = ['127.0.0.1']
         suffix = 'test'
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist(None,None,suffix)
             self.assertEqual(wordlist,stdin_wordlist)
 
     def test_word_with_prefix(self):
         stdin_wordlist = ['www','www2','www3']
         expected_wordlist = stdin_wordlist + ['dev-www','dev-www2','dev-www3']
         prefix = 'dev-'
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types =  self.wordlist.get_wordlist(None,prefix)
             self.assertEqual(wordlist,expected_wordlist)
 
     def test_words_with_suffix(self):
         stdin_wordlist = ['www','www2','www3']
         expected_wordlist = stdin_wordlist + ['wwwtest','www2test','www3test']
         suffix = 'test'
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist(None,None,suffix)
             self.assertEqual(wordlist, expected_wordlist)
 
     def test_words_with_host_and_prefix(self):
         stdin_wordlist = ['www.%s']
         expected_wordlist = stdin_wordlist + ['test-www.%s']
         prefix = 'test-'
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist(None, prefix)
             self.assertEqual(wordlist, expected_wordlist)
 
     def test_words_with_host_and_suffix(self):
         stdin_wordlist = ['www.%s']
         expected_wordlist = stdin_wordlist + ['wwwtest.%s']
         suffix = 'test'
-        with patch('lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
             wordlist, wordlist_types = self.wordlist.get_wordlist(None,None,suffix)
             self.assertEqual(wordlist, expected_wordlist)
 

VHostScan/tests/helpers/__init__.py renamed to tests/helpers/__init__.py

@@ -1,7 +1,7 @@
 import argparse
 import pytest
 
-from lib.input import cli_argument_parser
+from VHostScan.lib.input import cli_argument_parser
 
 def test_parse_arguments_default_value(tmpdir):
     words = ['word1', 'word2', 'word3']