Fix tests

Author: Emmanouil Konstantinidis

requirements.txt

@@ -1,7 +1,7 @@
 click==6.4
 flake8==2.5.4
-nose==1.3.7
-coverage==4.0.3
+nose2==0.6.4
+cov-core==1.15.0
 requests==2.9.1
 httpretty==0.8.14
 semantic-version==2.5.0

requirements/requirements-demo.txt

@@ -1,9 +1,9 @@
-Django==1.9.4
-click==6.3
-djangorestframework==3.3.3
+Django==1.7.1
+click==6.1
+djangorestframework==3.3.2
 django-crispy-forms==1.4.0
-drfdocs==0.0.9
-apscheduler==3.0.5
+drfdocs==0.0.5
+apscheduler==3.0.3
 
 # commented-package==1.2.3
 testing-errors-abc==0.0.12

runtests.py

@@ -4,7 +4,13 @@
 
 
 FLAKE8_ARGS = ['pypiup/', 'tests/', '--ignore=E501']
-COVERAGE_ARGS = ['--source=pypiup', '--omit=pypiup/__init__.py', 'nosetests', '-v']
+NOSE2_ARGS = [
+    '--with-coverage',
+    '--coverage', 'pypiup',
+    '--coverage-report', 'term-missing',
+    '--coverage-report', 'html',
+    '--verbose'
+]
 
 
 def exit_on_failure(command, message=None):
@@ -13,32 +19,16 @@ def exit_on_failure(command, message=None):
 
 
 def flake8_main(args):
-    print('Running: flake8', FLAKE8_ARGS)
+    print('Running: flake8 %s' % FLAKE8_ARGS)
     command = subprocess.call(['flake8'] + args)
-    print("" if command else "Success. flake8 passed.")
+    print("" if command else "Success. flake8 passed.\n")
     return command
 
 
 def run_tests(args):
-    print('Running: coverage run %s' % " ".join(COVERAGE_ARGS))
-    command = subprocess.call(['coverage', 'run'] + args, shell=True)
+    print('Running: nose2 -v %s' % " ".join(args))
+    command = subprocess.call(['nose2'] + args)
     return command
 
-
-def run_coverage_report():
-    print("\nCoverage Report:")
-    command = subprocess.call(['coverage', 'report', '-m'])
-    return command
-
-
-def run_coverage_html():
-    print("\nGenerating Coverage HTML.")
-    command = subprocess.call(['coverage', 'html'])
-    print("Coverage HTML generated.")
-    return command
-
-
 exit_on_failure(flake8_main(FLAKE8_ARGS))
-exit_on_failure(run_tests(COVERAGE_ARGS))
-exit_on_failure(run_coverage_report())
-exit_on_failure(run_coverage_html())
+exit_on_failure(run_tests(NOSE2_ARGS))

tests/tests_cli.py tests/test_cli.pytests/tests_cli.py renamed to tests/test_cli.py

@@ -76,5 +76,5 @@ def test_cli_file_not_found(self):
         self.assertEqual(result.exit_code, 0)
         self.assertIn("Could not find requirements-fake.txt. No such file or directory.", result.output)
 
-if __name__ == '__main__':
-    unittest.main()
+# if __name__ == '__main__':
+#     unittest.main()

tox.ini

@@ -7,6 +7,4 @@ setenv =
 deps =
     -rrequirements.txt
 commands =
-    pwd
-    ls -la
     python runtests.py