Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30A9A190F4 for ; Thu, 7 Apr 2016 19:48:56 +0000 (UTC) Received: (qmail 49208 invoked by uid 500); 7 Apr 2016 19:48:56 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 49163 invoked by uid 500); 7 Apr 2016 19:48:56 -0000 Mailing-List: contact commits-help@climate.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.apache.org Delivered-To: mailing list commits@climate.apache.org Received: (qmail 49154 invoked by uid 99); 7 Apr 2016 19:48:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 19:48:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 023FFDFE04; Thu, 7 Apr 2016 19:48:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lewismc@apache.org To: commits@climate.apache.org Date: Thu, 07 Apr 2016 19:48:55 -0000 Message-Id: <5d29ac1589814dbea8140bd90f32b4d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] climate git commit: CLIMATE-774 - Fix failing tests Repository: climate Updated Branches: refs/heads/master 5c261c6dd -> da17b0e35 CLIMATE-774 - Fix failing tests - Add 'mock' to pip-dependencies - Fix file path in test_utils.py Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/f936bcab Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/f936bcab Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/f936bcab Branch: refs/heads/master Commit: f936bcab738407d2be591ed1972425b94383836e Parents: 37dd5a8 Author: Ibrahim Authored: Mon Mar 28 22:43:37 2016 +0530 Committer: Ibrahim Committed: Mon Mar 28 22:43:37 2016 +0530 ---------------------------------------------------------------------- easy-ocw/ocw-pip-dependencies.txt | 1 + ocw/tests/test_utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/f936bcab/easy-ocw/ocw-pip-dependencies.txt ---------------------------------------------------------------------- diff --git a/easy-ocw/ocw-pip-dependencies.txt b/easy-ocw/ocw-pip-dependencies.txt index 8773730..9337964 100644 --- a/easy-ocw/ocw-pip-dependencies.txt +++ b/easy-ocw/ocw-pip-dependencies.txt @@ -9,3 +9,4 @@ sphinx==1.2.1 sphinxcontrib-httpdomain==1.2.1 esgf-pyclient==0.1.2 python-dateutil==2.4.1 +mock==1.3.0 http://git-wip-us.apache.org/repos/asf/climate/blob/f936bcab/ocw/tests/test_utils.py ---------------------------------------------------------------------- diff --git a/ocw/tests/test_utils.py b/ocw/tests/test_utils.py index 36cf42f..c112771 100644 --- a/ocw/tests/test_utils.py +++ b/ocw/tests/test_utils.py @@ -28,7 +28,7 @@ from ocw.dataset import Dataset import ocw.utils as utils class TestDecodeTimes(unittest.TestCase): - test_model = '../ocw-ui/backend/tests/example_data/lat_lon_time.nc' + test_model = os.getcwd() + '/ocw-ui/backend/tests/example_data/lat_lon_time.nc' def setUp(self): self.netcdf = netCDF4.Dataset(os.path.abspath(self.test_model), mode='r')