Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bug 711191] Fix elasticsearch timeout problem
If elasticsearch (the process) isn't available, then the ESTestCases set settings.ES_LIVE_INDEXING to True, then go to do some indexing stuff and throw an exception. Since that happens in setUp of ESTestCase, that means that tearDown never gets called and therefore teardown_indexes never gets called and settings.ES_LIVE_INDEXING never gets set back to False and then a whole bunch of tests run with incremental indexing on. Gah! This is a mediocre fix where we change the order of setup_indexes so we only set settings.ES_LIVE_INDEXING to True if indexing works. The better fix is to mock the setting in the specific tests so we don't end up in this situation.
- Loading branch information