Skip to content

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Mar 2, 2015

Fixes #146.

julen and others added 2 commits March 19, 2015 03:25
django.conf.settings.configured is not necessarily True, in case DSM
wasn't set during `pytest_load_initial_conftests`, but gets set in the
project's conftest (via `pytest_configure`).

Fixes pytest-dev#146
@blueyed
Copy link
Contributor Author

blueyed commented Mar 26, 2015

@pelme
I think this is good, but since it removes some assertion, I'd like you to verify it.

@pelme
Copy link
Member

pelme commented Mar 28, 2015

I cannot recall why that assertion was added, but I think it should be fine since all tests passes. I'll merge it now, @julen please try it out and open an issue if it doesn't work properly.

pelme added a commit that referenced this pull request Mar 28, 2015
@pelme pelme merged commit e2dec4f into pytest-dev:master Mar 28, 2015
@blueyed blueyed deleted the julen-issue/146 branch March 28, 2015 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support settings DJANGO_SETTINGS_MODULE in pytest_configure
3 participants