Merge pull request #45 from cehbrecht/cleanup-tests

cleanup tests
ESGF · Aug 6, 2019 · 8db9e13 · 8db9e13
2 parents 69bb245 + ed619b6
commit 8db9e13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/pyesgf/manifest.py b/pyesgf/manifest.py
@@ -255,7 +255,7 @@ def parse_timestamp(timestamp):
     if args.from_date:
         from_date = parse_timestamp(args.from_date)
     else:
-        from_date is None
+        from_date = None
 
     extract_from_solr(args.endpoint, args.project, args.repository,
                       from_date=from_date)
diff --git a/setup.cfg b/setup.cfg
@@ -1,8 +1,7 @@
 [tool:pytest]
-addopts =
-	--strict
-	--tb=native
 python_files = test_*.py
+testpaths = tests
+addopts = --strict --tb=native
 markers =
 	online: mark test to need internet connection
 	slow: mark test to be slow

diff --git a/setup.py b/setup.py
@@ -43,5 +43,4 @@
       extras_require={
           "dev": dev_reqs,              # pip install ".[dev]"
       },
-      entry_points={},
-      test_suite='test')
+      entry_points={},)