Merge pull request #439 from vidartf/chore-tests

Chore cleanup + fixe tests/CI

nbdime/tests/conftest.py

@@ -280,7 +280,7 @@ def merge_validator(request, json_schema_merge):
 
 class NBTestDataBase(object):
     def __init__(self):
-        self.filespath = filespath()
+        self.filespath = os.path.join(testspath(), "files")
         self.cache = {}
         filenames = glob.glob(os.path.join(self.filespath, "*.ipynb"))
         names = [os.path.basename(fn).replace(".ipynb", "") for fn in filenames]
@@ -390,14 +390,17 @@ def matching_nb_triplets(request):
 
 _port = 62019
 
-
-@fixture()
-def unique_port():
+def make_unique_port():
     global _port
     _port += 1
     return _port
 
 
+@fixture()
+def unique_port():
+    return make_unique_port()
+
+
 @fixture()
 def reset_diff_targets():
     try:
@@ -455,7 +458,7 @@ def _kill_nb_app():
     env = os.environ.copy()
     env.update({'JUPYTER_CONFIG_DIR': config_dir})
 
-    port = unique_port()
+    port = make_unique_port()
     root_dir = str(tmpdir_factory.getbasetemp())
 
     os.chdir(root_dir)

packages/webapp/webpack.config.js

@@ -27,7 +27,7 @@ module.exports = {
     ],
   },
   resolve: {
-    // Add '.ts' and '.tsx' as resolvable extensions.
+    // Add '.ts' as resolvable extension.
     extensions: [".webpack.js", ".web.js", ".ts", ".js"]
   }
 

setup.py

@@ -115,10 +115,10 @@
 
 extras_require = setuptools_args['extras_require'] = {
     'test': [
-        'pytest>=3.3',
+        'pytest>=3.6',
         'pytest-cov',
         'pytest-timeout',
-        'pytest-tornado5',
+        'pytest-tornado5>=2',
         'jsonschema',
         'mock',
         'requests',