Resolve CLIMATE-417. Merge PR #25
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/574d5776 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/574d5776 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/574d5776 Branch: refs/heads/master Commit: 574d577624f24b888812fd41b68215a3814231a2 Parents: 1793b4c 59db9d1 Author: Michael Joyce <[email protected]> Authored: Sat May 10 12:12:32 2014 -0700 Committer: Michael Joyce <[email protected]> Committed: Sat May 10 12:12:32 2014 -0700 ---------------------------------------------------------------------- ocw-ui/backend/tests/test_directory_helpers.py | 17 +++++++++++++++++ .../tests/test_local_file_metadata_extractors.py | 17 +++++++++++++++++ ocw-ui/backend/tests/test_processing.py | 17 +++++++++++++++++ ocw-ui/backend/tests/test_run_webservices.py | 17 +++++++++++++++++ 4 files changed, 68 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/574d5776/ocw-ui/backend/tests/test_directory_helpers.py ---------------------------------------------------------------------- diff --cc ocw-ui/backend/tests/test_directory_helpers.py index b2a8b22,627fe50..59b95a4 --- a/ocw-ui/backend/tests/test_directory_helpers.py +++ b/ocw-ui/backend/tests/test_directory_helpers.py @@@ -1,5 -1,21 +1,22 @@@ + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file + # distributed with this work for additional information + # regarding copyright ownership. The ASF licenses this file + # to you under the Apache License, Version 2.0 (the + # "License"); you may not use this file except in compliance + # with the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, + # software distributed under the License is distributed on an + # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + # KIND, either express or implied. See the License for the + # specific language governing permissions and limitations + # under the License. + import os +import re import unittest from webtest import TestApp http://git-wip-us.apache.org/repos/asf/climate/blob/574d5776/ocw-ui/backend/tests/test_processing.py ---------------------------------------------------------------------- diff --cc ocw-ui/backend/tests/test_processing.py index c1e4622,3bc9698..cc26b26 --- a/ocw-ui/backend/tests/test_processing.py +++ b/ocw-ui/backend/tests/test_processing.py @@@ -1,5 -1,23 +1,22 @@@ + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file + # distributed with this work for additional information + # regarding copyright ownership. The ASF licenses this file + # to you under the Apache License, Version 2.0 (the + # "License"); you may not use this file except in compliance + # with the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, + # software distributed under the License is distributed on an + # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + # KIND, either express or implied. See the License for the + # specific language governing permissions and limitations + # under the License. + import os import unittest -from urllib import urlretrieve import datetime as dt from webtest import TestApp http://git-wip-us.apache.org/repos/asf/climate/blob/574d5776/ocw-ui/backend/tests/test_run_webservices.py ----------------------------------------------------------------------
