Author: bugman Date: Tue Jul 19 11:18:34 2011 New Revision: 13710 URL: http://svn.gna.org/viewcvs/relax?rev=13710&view=rev Log: Replaced all calls to ds.__reset__() with calls to generic_fns.reset.reset(). This is needed as the relax data store is only part of the permanent data kept within relax. The status object and other data will need to be dealt with now. The use of generic_fns.reset.reset() by all parts of relax makes this resetting more uniform and clean. The system and unit tests have have been simplified by shifting the tearDown() method into the SystemTestCase and UnitTestCase base classes. The tearDown() methods were mainly used to reset relax, so this is now unified in the base class via generic_fns.reset.reset(). Added: branches/gui_testing/test_suite/unit_tests/base_classes.py - copied, changed from r13706, branches/gui_testing/test_suite/system_tests/base_classes.py Modified: branches/gui_testing/generic_fns/state.py branches/gui_testing/test_suite/gui_tests/noe.py branches/gui_testing/test_suite/gui_tests/rx.py branches/gui_testing/test_suite/system_tests/align_tensor.py branches/gui_testing/test_suite/system_tests/angles.py branches/gui_testing/test_suite/system_tests/base_classes.py branches/gui_testing/test_suite/system_tests/bmrb.py branches/gui_testing/test_suite/system_tests/consistency_tests.py branches/gui_testing/test_suite/system_tests/dasha.py branches/gui_testing/test_suite/system_tests/diffusion_tensor.py branches/gui_testing/test_suite/system_tests/frame_order.py branches/gui_testing/test_suite/system_tests/generic.py branches/gui_testing/test_suite/system_tests/jw_mapping.py branches/gui_testing/test_suite/system_tests/load_spins.py branches/gui_testing/test_suite/system_tests/model_elimination.py branches/gui_testing/test_suite/system_tests/model_free.py branches/gui_testing/test_suite/system_tests/model_selection.py branches/gui_testing/test_suite/system_tests/n_state_model.py branches/gui_testing/test_suite/system_tests/noe.py branches/gui_testing/test_suite/system_tests/noe_restraints.py branches/gui_testing/test_suite/system_tests/palmer.py branches/gui_testing/test_suite/system_tests/pdc.py branches/gui_testing/test_suite/system_tests/peak_lists.py branches/gui_testing/test_suite/system_tests/pipes.py branches/gui_testing/test_suite/system_tests/relax_data.py branches/gui_testing/test_suite/system_tests/relax_fit.py branches/gui_testing/test_suite/system_tests/results.py branches/gui_testing/test_suite/system_tests/sequence.py branches/gui_testing/test_suite/system_tests/state.py branches/gui_testing/test_suite/system_tests/structure.py branches/gui_testing/test_suite/system_tests/unit_vectors.py branches/gui_testing/test_suite/unit_tests/_data/test___init__.py branches/gui_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py branches/gui_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py branches/gui_testing/test_suite/unit_tests/_generic_fns/test_align_tensor.py branches/gui_testing/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py branches/gui_testing/test_suite/unit_tests/_generic_fns/test_pipes.py branches/gui_testing/test_suite/unit_tests/_generic_fns/test_selection.py branches/gui_testing/test_suite/unit_tests/_prompt/test_align_tensor.py branches/gui_testing/test_suite/unit_tests/_specific_fns/_model_free/test_main.py branches/gui_testing/test_suite/unit_tests/align_tensor_testing_base.py branches/gui_testing/test_suite/unit_tests/diffusion_tensor_testing_base.py branches/gui_testing/test_suite/unit_tests/minimisation_testing_base.py branches/gui_testing/test_suite/unit_tests/model_free_testing_base.py branches/gui_testing/test_suite/unit_tests/molecule_testing_base.py branches/gui_testing/test_suite/unit_tests/n_state_model_testing_base.py branches/gui_testing/test_suite/unit_tests/package_checking.py branches/gui_testing/test_suite/unit_tests/relax_data_testing_base.py branches/gui_testing/test_suite/unit_tests/residue_testing_base.py branches/gui_testing/test_suite/unit_tests/sequence_testing_base.py branches/gui_testing/test_suite/unit_tests/spin_testing_base.py branches/gui_testing/test_suite/unit_tests/state_testing_base.py branches/gui_testing/test_suite/unit_tests/structure_testing_base.py branches/gui_testing/test_suite/unit_tests/value_testing_base.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/gui_testing/generic_fns/state.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/state.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/gui_tests/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/gui_tests/noe.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/gui_tests/rx.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/gui_tests/rx.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/align_tensor.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/angles.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/angles.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/base_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/base_classes.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/bmrb.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/bmrb.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/consistency_tests.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/dasha.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/dasha.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/diffusion_tensor.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/frame_order.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/generic.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/generic.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/jw_mapping.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/load_spins.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/load_spins.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/model_elimination.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/model_elimination.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/model_free.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/model_selection.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/model_selection.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/n_state_model.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/noe.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/noe_restraints.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/noe_restraints.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/palmer.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/palmer.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/pdc.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/pdc.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/peak_lists.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/peak_lists.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/pipes.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/pipes.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/relax_data.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/relax_fit.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/results.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/results.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/sequence.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/sequence.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/state.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/state.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/structure.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/structure.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/system_tests/unit_vectors.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/unit_vectors.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_data/test___init__.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_data/test___init__.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_generic_fns/test_align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_generic_fns/test_align_tensor.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_generic_fns/test_pipes.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_generic_fns/test_pipes.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_generic_fns/test_selection.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_generic_fns/test_selection.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_prompt/test_align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_prompt/test_align_tensor.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/_specific_fns/_model_free/test_main.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/_specific_fns/_model_free/test_main.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/align_tensor_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/align_tensor_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Copied: branches/gui_testing/test_suite/unit_tests/base_classes.py (from r13706, branches/gui_testing/test_suite/system_tests/base_classes.py) URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/base_classes.py?p2=branches/gui_testing/test_suite/unit_tests/base_classes.py&p1=branches/gui_testing/test_suite/system_tests/base_classes.py&r1=13706&r2=13710&rev=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/diffusion_tensor_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/diffusion_tensor_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/minimisation_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/minimisation_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/model_free_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/model_free_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/molecule_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/molecule_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/n_state_model_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/n_state_model_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/package_checking.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/package_checking.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/relax_data_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/relax_data_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/residue_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/residue_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/sequence_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/sequence_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/spin_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/spin_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/state_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/state_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/structure_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/structure_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff Modified: branches/gui_testing/test_suite/unit_tests/value_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/unit_tests/value_testing_base.py?rev=13710&r1=13709&r2=13710&view=diff