Merge git://git.apache.org/climate into mccsearch
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/a5b7677b Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/a5b7677b Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/a5b7677b Branch: refs/heads/master Commit: a5b7677b528197daf1dee5cb05adeac35bc4846d Parents: f21e24d b6db8f8 Author: kwhitehall <[email protected]> Authored: Thu May 15 15:23:27 2014 -0400 Committer: kwhitehall <[email protected]> Committed: Thu May 15 15:23:27 2014 -0400 ---------------------------------------------------------------------- ocw-ui/backend/rcmed_helpers.py | 1 + ocw-ui/backend/tests/__init__.py | 16 ++++ ocw-ui/backend/tests/test_directory_helpers.py | 85 +++++++++++++------- .../test_local_file_metadata_extractors.py | 17 ++++ ocw-ui/backend/tests/test_processing.py | 58 +++++-------- ocw-ui/backend/tests/test_run_webservices.py | 26 ++++-- ocw/evaluation.py | 2 + setup.py | 6 +- 8 files changed, 135 insertions(+), 76 deletions(-) ----------------------------------------------------------------------
