Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Fix bug 1130383 - Get rid of test-utils. #3109

Merged
merged 1 commit into from Mar 18, 2015
Merged

Fix bug 1130383 - Get rid of test-utils. #3109

merged 1 commit into from Mar 18, 2015

Conversation

jezdez
Copy link
Contributor

@jezdez jezdez commented Mar 10, 2015

No description provided.

@jezdez jezdez force-pushed the bug1130383 branch 2 times, most recently from 0c7d0c1 to c0453c5 Compare March 10, 2015 18:24
@robhudson
Copy link
Contributor

Don't forget settings.py... settings.INSTALLED apps and settings.TEST_RUNNER.

@robhudson
Copy link
Contributor

r+ when tests pass.

@ubernostrum
Copy link
Contributor

Should have sent... a poet...

jodileansm

@jezdez jezdez force-pushed the bug1130383 branch 4 times, most recently from 758264e to 55aace2 Compare March 11, 2015 14:50
settings_mod = 'settings_local'

# override the env var with what we want
os.environ['DJANGO_SETTINGS_MODULE'] = settings_mod
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you happy with this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hahaha, "happy". No

@robhudson robhudson assigned jezdez and unassigned robhudson Mar 11, 2015
@robhudson
Copy link
Contributor

Back to you with questions and one minor fix.

@groovecoder
Copy link
Contributor

To run the tests in my vm, I had to copy the DATABASES setting from settings_local.py into settings_test.py now that we only load one or the other in manage.py? Is that the right way to run locally, or do we need to update test instructions somehow?

@groovecoder groovecoder assigned jezdez and unassigned groovecoder Mar 16, 2015
@groovecoder
Copy link
Contributor

ping @jezdez - what do you think? Should we copy the DATABASES setting into settings_test.py so dev environments can run the tests out-of-the-box?

@jezdez
Copy link
Contributor Author

jezdez commented Mar 17, 2015

@groovecoder No, we should update the settings.py to have the database setting that we expect for local development including testing, I don't understand why we even have an "empty" DATABASES setting in there that won't work anyway. That means that the Travis settings need an overridden DATABASES setting using the root user following http://docs.travis-ci.com/user/database-setup/#MySQL

@groovecoder
Copy link
Contributor

Makes sense. So you'll fill in the DATABASES setting in settings.py as part of this PR? Or is that a step for another PR?

@jezdez
Copy link
Contributor Author

jezdez commented Mar 17, 2015

@groovecoder Part of this PR

@jezdez jezdez force-pushed the bug1130383 branch 2 times, most recently from 3b7cd5b to 4b26d28 Compare March 18, 2015 17:33
@groovecoder
Copy link
Contributor

I checked this out and it works locally! Just needs a rebase and then it's good to merge?

Also clean up some of the database settings.
@jezdez
Copy link
Contributor Author

jezdez commented Mar 18, 2015

@groovecoder Yeah, IMO

groovecoder added a commit that referenced this pull request Mar 18, 2015
Fix bug 1130383 - Get rid of test-utils.
@groovecoder groovecoder merged commit 026405c into master Mar 18, 2015
@groovecoder groovecoder deleted the bug1130383 branch March 18, 2015 22:08
@groovecoder groovecoder mentioned this pull request Mar 18, 2015
35 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants