@@ -234,7 +234,7 @@ unittest-nonlabile: build # test if no errors would result if we force enabling of all states unittest-states: build @echo "I: Running unittests with all states enabled." - @PYTHONPATH=.:$(PYTHONPATH) MVPA_DEBUG=CHECK_STATES_ENABLED python mvpa/tests/main.py + @PYTHONPATH=.:$(PYTHONPATH) MVPA_DEBUG=ENFORCE_STATES_ENABLED python mvpa/tests/main.py # Run unittests with optimization on -- helps to catch unconditional # debug calls Makefile @@ -226,7 +226,7 @@ if __debug__: "Checking in checking if clf was trained on given dataset") debug.register('CHECK_RETRAIN', "Checking in retraining/retesting") debug.register('CHECK_STABILITY', "Checking for numerical stability") - debug.register('CHECK_STATES_ENABLED', "Forcing all states to be enabled") + debug.register('ENFORCE_STATES_ENABLED', "Forcing all states to be enabled") debug.register('MAP', "*Mapper") debug.register('MAP_', "*Mapper (verbose)") mvpa/base/__init__.py @@ -222,7 +222,7 @@ class StateVariable(CollectableAttribute): def __init__(self, name=None, enabled=True, doc="State variable"): # Force enabled state regardless of the input # to facilitate testing - if __debug__ and 'CHECK_STATES_ENABLED' in debug.active: + if __debug__ and 'ENFORCE_STATES_ENABLED' in debug.active: enabled = True CollectableAttribute.__init__(self, name, doc) self._isenabled = enabled mvpa/misc/attributes.py @@ -129,7 +129,7 @@ class StateTests(unittest.TestCase): proper.states.enable(['state2']) self.failUnlessEqual(Set(proper.states.names), Set(['state1', 'state2'])) - if __debug__ and 'CHECK_STATES_ENABLED' in debug.active: + if __debug__ and 'ENFORCE_STATES_ENABLED' in debug.active: # skip testing since all states are on now return self.failUnless(proper.states.enabled == ['state2']) @@ -169,7 +169,7 @@ class StateTests(unittest.TestCase): def testGetSaveEnabled(self): """Check if we can store/restore set of enabled states""" - if __debug__ and 'CHECK_STATES_ENABLED' in debug.active: + if __debug__ and 'ENFORCE_STATES_ENABLED' in debug.active: # skip testing since all states are on now return @@ -194,7 +194,7 @@ class StateTests(unittest.TestCase): proper = TestClassProper() properch = TestClassProperChild(enable_states=["state1"]) - if __debug__ and 'CHECK_STATES_ENABLED' in debug.active: + if __debug__ and 'ENFORCE_STATES_ENABLED' in debug.active: # skip testing since all states are on now return mvpa/tests/test_state.py ffa7bc26d6a32e3199d5993368f2c590219c10e0 Yaroslav Halchenko debian@onerussian.com http://github.com/yarikoptic/PyMVPA/commit/0562aa4aa9c44afa11d5118e85998d50e01c42db 0562aa4aa9c44afa11d5118e85998d50e01c42db 2009-10-08T16:26:02-07:00 2009-10-08T14:08:11-07:00 BF: renamed CHECK_STATES_ENABLED to ENFORCE_STATES_ENABLED all CHECK_ get enabled in tests/main.py so it forces all states on as well -- that is not desired. On the other hand -- such setting detects a plethora of new issues; therefore it remains desired to run unittest-states a4ada10e374b27bb7f594f4d9e91890a57f9bd84 Yaroslav Halchenko debian@onerussian.com