Skip to content

Fix portability of whatsnew test. #2156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelson merged 1 commit into from
Oct 6, 2016
Merged

Fix portability of whatsnew test. #2156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/iris/tests/test_whatsnew_contributions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2010 - 2015, Met Office
# (C) British Crown Copyright 2010 - 2016, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -39,6 +39,7 @@
import os
import os.path
import subprocess
import sys

import iris

Expand All @@ -61,8 +62,9 @@ def test_check_contributions(self):
# Travis bypasses this problem by running the test directly.
if os.path.exists(whatsnew_dirpath):
# Run a 'check contributions' command in that directory.
cmd = 'python aggregate_directory.py --checkonly --quiet'
subprocess.check_call(cmd, cwd=whatsnew_dirpath, shell=True)
cmd = [sys.executable, 'aggregate_directory.py', '--checkonly',
'--quiet']
subprocess.check_call(cmd, cwd=whatsnew_dirpath)


if __name__ == "__main__":
Expand Down