Merge pull request #269 from lsst/tickets/DM-11514-afw

DM-11514: Fix some pytest problems
lsst · Aug 8, 2017 · b131724 · b131724
2 parents ba14e82 + 74c0022
commit b131724
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ _build.*
 *~
 *.dSYM/
 core.*
+.cache/
 .sconf_temp
 .sconsign.dblite
 config.log

diff --git a/tests/SConscript b/tests/SConscript
@@ -5,16 +5,12 @@ pybind11_test_modules = ['testTableArchivesLib']
 
 scripts.BasicSConscript.pybind11(pybind11_test_modules)
 
+# copy AFWDATA_DIR to the test's environment
 afwdataDir = env.ProductDir("afwdata")
+if afwdataDir:
+    env["ENV"]["AFWDATA_DIR"] = afwdataDir
 
-if not afwdataDir:
-        testArgs = dict(statistics = "--run_test=!StatisticsTestImages",
-                        background = "--run_test=!BackgroundTestImages",)
-        scripts.BasicSConscript.tests(noBuildList=[name + '.cc' for name in pybind11_test_modules],
-                                      args=testArgs)
-else:
-        # copy AFWDATA_DIR to the test's environment
-        env["ENV"]["AFWDATA_DIR"] = afwdataDir
-        scripts.BasicSConscript.tests(noBuildList=[name + '.cc' for name in pybind11_test_modules])
+scripts.BasicSConscript.tests(noBuildList=[name + '.cc' for name in pybind11_test_modules],
+                              ignoreList=[name + '.py' for name in pybind11_test_modules])
 
 env.Clean(targets["tests"], "#testTable.fits")
diff --git a/tests/testDir.py → tests/test_dir.py b/tests/testDir.py → tests/test_dir.py
diff --git a/tests/test_footprint.py b/tests/test_footprint.py
@@ -271,7 +271,7 @@ class TestMemory(lsst.utils.tests.MemoryTestCase):
     pass
 
 
-def set_module(module):
+def setup_module(module):
     lsst.utils.tests.init()
 
 

diff --git a/tests/test_spanSets.py b/tests/test_spanSets.py
@@ -417,7 +417,7 @@ class TestMemory(lsst.utils.tests.MemoryTestCase):
     pass
 
 
-def set_module(module):
+def setup_module(module):
     lsst.utils.tests.init()