Merge lp://staging/~zyga/django-testscenarios/0.6 into lp://staging/django-testscenarios
Status: | Merged |
---|---|
Merged at revision: | 23 |
Proposed branch: | lp://staging/~zyga/django-testscenarios/0.6 |
Merge into: | lp://staging/django-testscenarios |
Diff against target: |
431 lines (+160/-56) 15 files modified
django_testproject/settings.py (+16/-14) django_testproject/templates/django_testproject/base.html (+10/-0) django_testproject/templates/registration/base.html (+4/-0) django_testproject/templates/registration/logged_out.html (+3/-0) django_testproject/templates/registration/login.html (+25/-0) django_testproject/tests.py (+50/-3) django_testscenarios/__init__.py (+17/-0) django_testscenarios/models.py (+1/-1) django_testscenarios/test_project/__init__.py (+1/-1) django_testscenarios/test_project/manage.py (+2/-2) django_testscenarios/test_project/settings.py (+2/-6) django_testscenarios/test_project/tests.py (+6/-2) django_testscenarios/tests.py (+6/-6) django_testscenarios/ubertest.py (+5/-6) setup.py (+12/-15) |
To merge this branch: | bzr merge lp://staging/~zyga/django-testscenarios/0.6 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Linaro Validation Team | Pending | ||
Review via email: mp+61984@code.staging.launchpad.net |
Description of the change
Fix design issue and release 0.6
The design issue was related to way django-testproject worked. It previously assumed that local test project would always have the name 'test_project'. This turned out to be a bad decision because of the way django double-imports settings with different paths. With simple scenario it could lead to wrong test_project being imported (different one in each python process).
To fix this I had to break backwards compatibility. There are few ways this affects users:
1) Instead of django_
2) To make it possible to import django_