78 lines
1.9 KiB
Diff
78 lines
1.9 KiB
Diff
|
---
|
||
|
|
dev-requirements.txt | 2 --
|
||
|
|
setup.py | 2 --
|
||
|
|
test_elasticsearch/run_tests.py | 13 ++-----------
|
||
|
|
test_elasticsearch/test_helpers.py | 2 +-
|
||
|
|
4 files changed, 3 insertions(+), 16 deletions(-)
|
||
|
|
|
||
|
|
--- a/dev-requirements.txt
|
||
|
|
+++ b/dev-requirements.txt
|
||
|
|
@@ -1,8 +1,6 @@
|
||
|
|
requests>=2, <3
|
||
|
|
-nose
|
||
|
|
coverage
|
||
|
|
mock
|
||
|
|
-nosexcover
|
||
|
|
sphinx<1.7
|
||
|
|
sphinx_rtd_theme
|
||
|
|
jinja2
|
||
|
|
--- a/setup.py
|
||
|
|
+++ b/setup.py
|
||
|
|
@@ -13,11 +13,9 @@ with open(join(dirname(__file__), "READM
|
||
|
|
install_requires = ["urllib3>=1.21.1"]
|
||
|
|
tests_require = [
|
||
|
|
"requests>=2.0.0, <3.0.0",
|
||
|
|
- "nose",
|
||
|
|
"coverage",
|
||
|
|
"mock",
|
||
|
|
"pyyaml",
|
||
|
|
- "nosexcover",
|
||
|
|
]
|
||
|
|
|
||
|
|
docs_require = ["sphinx<1.7", "sphinx_rtd_theme"]
|
||
|
|
--- a/test_elasticsearch/run_tests.py
|
||
|
|
+++ b/test_elasticsearch/run_tests.py
|
||
|
|
@@ -6,7 +6,7 @@ from os import environ
|
||
|
|
from os.path import dirname, join, pardir, abspath, exists
|
||
|
|
import subprocess
|
||
|
|
|
||
|
|
-import nose
|
||
|
|
+import unittest
|
||
|
|
|
||
|
|
|
||
|
|
def fetch_es_repo():
|
||
|
|
@@ -64,21 +64,12 @@ def run_all(argv=None):
|
||
|
|
# fetch yaml tests
|
||
|
|
fetch_es_repo()
|
||
|
|
|
||
|
|
- # always insert coverage when running tests
|
||
|
|
if argv is None:
|
||
|
|
argv = [
|
||
|
|
- "nosetests",
|
||
|
|
- "--with-xunit",
|
||
|
|
- "--with-xcoverage",
|
||
|
|
- "--cover-package=elasticsearch",
|
||
|
|
- "--cover-erase",
|
||
|
|
- "--logging-filter=elasticsearch",
|
||
|
|
- "--logging-level=DEBUG",
|
||
|
|
"--verbose",
|
||
|
|
- "--with-id",
|
||
|
|
]
|
||
|
|
|
||
|
|
- nose.run_exit(argv=argv, defaultTest=abspath(dirname(__file__)))
|
||
|
|
+ unittest.main(argv=argv, defaultTest=abspath(dirname(__file__)))
|
||
|
|
|
||
|
|
|
||
|
|
if __name__ == "__main__":
|
||
|
|
--- a/test_elasticsearch/test_helpers.py
|
||
|
|
+++ b/test_elasticsearch/test_helpers.py
|
||
|
|
@@ -2,7 +2,7 @@
|
||
|
|
import mock
|
||
|
|
import time
|
||
|
|
import threading
|
||
|
|
-from nose.plugins.skip import SkipTest
|
||
|
|
+from unittest import SkipTest
|
||
|
|
from elasticsearch import helpers, Elasticsearch
|
||
|
|
from elasticsearch.serializer import JSONSerializer
|
||
|
|
|