Skip to content

Commit

Permalink
Revert "Reset filter list before running each test"
Browse files Browse the repository at this point in the history
This reverts commit c92c552.

Reviewer indicates that the fix should be in the obs packages
  • Loading branch information
timj committed Aug 22, 2017
1 parent c92c552 commit dbd15d7
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 20 deletions.
4 changes: 0 additions & 4 deletions tests/test_jointcal_cfht.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import lsst.afw.coord
import lsst.afw.geom
import lsst.afw.image.utils
import lsst.utils
import lsst.pex.exceptions

Expand All @@ -25,9 +24,6 @@ class JointcalTestCFHT(jointcalTestBase.JointcalTestBase, lsst.utils.tests.TestC

@classmethod
def setUpClass(cls):
# Clear the internal filter list to allow these instrument
# filters to be initialized.
lsst.afw.image.utils.resetFilters()
try:
cls.data_dir = lsst.utils.getPackageDir('testdata_jointcal')
os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(cls.data_dir, 'cfht_and_index')
Expand Down
4 changes: 0 additions & 4 deletions tests/test_jointcal_cfht_minimal.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import lsst.afw.coord
import lsst.afw.geom
import lsst.afw.image.utils
import lsst.utils
import lsst.pex.exceptions

Expand All @@ -22,9 +21,6 @@ def setup_module(module):
class JointcalTestCFHTMinimal(jointcalTestBase.JointcalTestBase, lsst.utils.tests.TestCase):
@classmethod
def setUpClass(cls):
# Clear the internal filter list to allow these instrument
# filters to be initialized.
lsst.afw.image.utils.resetFilters()
try:
cls.data_dir = lsst.utils.getPackageDir('testdata_jointcal')
os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(cls.data_dir, 'cfht_and_index')
Expand Down
4 changes: 0 additions & 4 deletions tests/test_jointcal_decam.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import lsst.afw.coord
import lsst.afw.geom
import lsst.afw.image.utils
import lsst.utils
import lsst.pex.exceptions

Expand All @@ -27,9 +26,6 @@ class JointcalTestDECAM(jointcalTestBase.JointcalTestBase, lsst.utils.tests.Test

@classmethod
def setUpClass(cls):
# Clear the internal filter list to allow these instrument
# filters to be initialized.
lsst.afw.image.utils.resetFilters()
try:
cls.data_dir = lsst.utils.getPackageDir('testdata_jointcal')
os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(cls.data_dir, 'decam_and_index')
Expand Down
4 changes: 0 additions & 4 deletions tests/test_jointcal_hsc.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import lsst.afw.coord
import lsst.afw.geom
import lsst.afw.image.utils
import lsst.utils
import lsst.pex.exceptions
from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
Expand All @@ -27,9 +26,6 @@ class JointcalTestHSC(jointcalTestBase.JointcalTestBase, lsst.utils.tests.TestCa

@classmethod
def setUpClass(cls):
# Clear the internal filter list to allow these instrument
# filters to be initialized.
lsst.afw.image.utils.resetFilters()
try:
cls.data_dir = lsst.utils.getPackageDir('testdata_jointcal')
os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(cls.data_dir, 'hsc_and_index')
Expand Down
4 changes: 0 additions & 4 deletions tests/test_jointcal_lsstSim.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import lsst.afw.geom
import lsst.afw.image
import lsst.afw.image.utils
import lsst.afw.coord
import lsst.utils
import lsst.pex.exceptions
Expand All @@ -29,9 +28,6 @@ class JointcalTestLSSTSim(jointcalTestBase.JointcalTestBase, lsst.utils.tests.Te

@classmethod
def setUpClass(cls):
# Clear the internal filter list to allow these instrument
# filters to be initialized.
lsst.afw.image.utils.resetFilters()
try:
cls.data_dir = lsst.utils.getPackageDir('testdata_jointcal')
os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(cls.data_dir, 'twinkles1_and_index')
Expand Down

0 comments on commit dbd15d7

Please sign in to comment.