Merge pull request #89 from lsst/tickets/DM-11514-meas_base

DM-11514: Fix pytest execution
lsst · Aug 9, 2017 · 2b73ae2 · 2b73ae2
2 parents cd81c4c + 1d4a97a
commit 2b73ae2
Show file tree

Hide file tree

Showing 34 changed files with 6 additions and 2 deletions.
diff --git a/tests/SConscript b/tests/SConscript
@@ -2,6 +2,10 @@
 from lsst.sconsUtils import scripts
 
 pybind11_test_modules = ['sillyCentroid',]
+noBuildList = [name + '.cc' for name in pybind11_test_modules]
+ignoreList = [name + '.py' for name in pybind11_test_modules]
+ignoreList.append('testLib.py')
 
 scripts.BasicSConscript.pybind11(pybind11_test_modules)
-scripts.BasicSConscript.tests(noBuildList=[name + '.cc' for name in pybind11_test_modules])
+scripts.BasicSConscript.tests(noBuildList=noBuildList,
+                              ignoreList=ignoreList)
diff --git a/tests/testApCorrNameSet.py → tests/test_ApCorrNameSet.py b/tests/testApCorrNameSet.py → tests/test_ApCorrNameSet.py
diff --git a/tests/testApertureFlux.py → tests/test_ApertureFlux.py b/tests/testApertureFlux.py → tests/test_ApertureFlux.py
diff --git a/tests/testApplyApCorr.py → tests/test_ApplyApCorr.py b/tests/testApplyApCorr.py → tests/test_ApplyApCorr.py
diff --git a/tests/testBlendedness.py → tests/test_Blendedness.py b/tests/testBlendedness.py → tests/test_Blendedness.py
diff --git a/tests/testCatalogCalculation.py → tests/test_CatalogCalculation.py b/tests/testCatalogCalculation.py → tests/test_CatalogCalculation.py
diff --git a/tests/testCentroidChecker.py → tests/test_CentroidChecker.py b/tests/testCentroidChecker.py → tests/test_CentroidChecker.py
diff --git a/tests/testClassification.py → tests/test_Classification.py b/tests/testClassification.py → tests/test_Classification.py
diff --git a/tests/testFPPosition.py → tests/test_FPPosition.py b/tests/testFPPosition.py → tests/test_FPPosition.py
diff --git a/tests/testFlagHandler.py → tests/test_FlagHandler.py b/tests/testFlagHandler.py → tests/test_FlagHandler.py
diff --git a/tests/testFootprintArea.py → tests/test_FootprintArea.py b/tests/testFootprintArea.py → tests/test_FootprintArea.py
diff --git a/tests/testGaussianCentroid.py → tests/test_GaussianCentroid.py b/tests/testGaussianCentroid.py → tests/test_GaussianCentroid.py
diff --git a/tests/testGaussianFlux.py → tests/test_GaussianFlux.py b/tests/testGaussianFlux.py → tests/test_GaussianFlux.py
diff --git a/tests/testImportCentroidAlgorithm.py → tests/test_ImportCentroidAlgorithm.py b/tests/testImportCentroidAlgorithm.py → tests/test_ImportCentroidAlgorithm.py
diff --git a/tests/testInputCount.py → tests/test_InputCount.py b/tests/testInputCount.py → tests/test_InputCount.py
diff --git a/tests/testInputUtilities.py → tests/test_InputUtilities.py b/tests/testInputUtilities.py → tests/test_InputUtilities.py
diff --git a/tests/testJacobian.py → tests/test_Jacobian.py b/tests/testJacobian.py → tests/test_Jacobian.py
diff --git a/tests/testMeasureSources.py → tests/test_MeasureSources.py b/tests/testMeasureSources.py → tests/test_MeasureSources.py
diff --git a/tests/testNaiveCentroid.py → tests/test_NaiveCentroid.py b/tests/testNaiveCentroid.py → tests/test_NaiveCentroid.py
diff --git a/tests/testNoiseReplacer.py → tests/test_NoiseReplacer.py b/tests/testNoiseReplacer.py → tests/test_NoiseReplacer.py
diff --git a/tests/testPeakCentroid.py → tests/test_PeakCentroid.py b/tests/testPeakCentroid.py → tests/test_PeakCentroid.py
diff --git a/tests/testPeakLikelihoodFlux.py → tests/test_PeakLikelihoodFlux.py b/tests/testPeakLikelihoodFlux.py → tests/test_PeakLikelihoodFlux.py
diff --git a/tests/testPixelFlags.py → tests/test_PixelFlags.py b/tests/testPixelFlags.py → tests/test_PixelFlags.py
diff --git a/tests/testPluginLogs.py → tests/test_PluginLogs.py b/tests/testPluginLogs.py → tests/test_PluginLogs.py
diff --git a/tests/testPsfFlux.py → tests/test_PsfFlux.py b/tests/testPsfFlux.py → tests/test_PsfFlux.py
diff --git a/tests/testScaledApertureFlux.py → tests/test_ScaledApertureFlux.py b/tests/testScaledApertureFlux.py → tests/test_ScaledApertureFlux.py
diff --git a/tests/testSdssCentroid.py → tests/test_SdssCentroid.py b/tests/testSdssCentroid.py → tests/test_SdssCentroid.py
diff --git a/tests/testSdssShape.py → tests/test_SdssShape.py b/tests/testSdssShape.py → tests/test_SdssShape.py
diff --git a/tests/testShapeUtilities.py → tests/test_ShapeUtilities.py b/tests/testShapeUtilities.py → tests/test_ShapeUtilities.py
diff --git a/tests/testSincPhotSums.py → tests/test_SincPhotSums.py b/tests/testSincPhotSums.py → tests/test_SincPhotSums.py
diff --git a/tests/testSkyCoord.py → tests/test_SkyCoord.py b/tests/testSkyCoord.py → tests/test_SkyCoord.py
diff --git a/tests/testTransform.py → tests/test_Transform.py b/tests/testTransform.py → tests/test_Transform.py
diff --git a/tests/testVariance.py → tests/test_Variance.py b/tests/testVariance.py → tests/test_Variance.py
diff --git a/tests/centroid.py → tests/test_centroid.py b/tests/centroid.py → tests/test_centroid.py
@@ -292,7 +292,7 @@ class MemoryTester(lsst.utils.tests.MemoryTestCase):
     pass
 
 
-def setup_modul(module):
+def setup_module(module):
     lsst.utils.tests.init()