Merge lp://qastaging/~doctormo/dmedia/uploadserver into lp://qastaging/dmedia
Proposed by
Martin Owens
Status: | Merged |
---|---|
Merged at revision: | 173 |
Proposed branch: | lp://qastaging/~doctormo/dmedia/uploadserver |
Merge into: | lp://qastaging/dmedia |
Diff against target: |
486 lines (+477/-0) 2 files modified
dmedia/tests/test_uploadserver.py (+195/-0) dmedia/uploadserver.py (+282/-0) |
To merge this branch: | bzr merge lp://qastaging/~doctormo/dmedia/uploadserver |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jason Gerard DeRose | Approve | ||
Review via email:
|
Description of the change
Request merge for this lovely and exciting upload server code. Please review strongly.
Includes test suite.
To post a comment you must log in.
Looks great, Martin, thanks! Just one small change needed, please fix the import in test_uploadserv er.py. Change:
from uploadserver import UploadApp, CHUNK_SIZE, UPLOAD_DIR
To:
from dmedia.uploadserver import UploadApp, CHUNK_SIZE, UPLOAD_DIR
You can run just the tests for this module like this:
./setup.py test --names= uploadserver