From ffdfee2c78462b53ae9af1e414cc71a8734e606a Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Thu, 31 Mar 2016 11:44:02 +0100
Subject: Fix issues running tests outside a Baserock system

Warn if 'Yarn' isn't available, since this means most tests don't run.

Also fix some issue with missing .coverage file that I hit.

Change-Id: I675354799bbdefe1ced0f5a0c5221b103de29a1c
---
 check    | 17 +++++++++++------
 setup.py |  7 +++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/check b/check
index 276c0337..4a13d1c9 100755
--- a/check
+++ b/check
@@ -2,7 +2,7 @@
 #
 # Run test suite for morph.
 #
-# Copyright (C) 2011-2015  Codethink Limited
+# Copyright (C) 2011-2016  Codethink Limited
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -138,9 +138,14 @@ fi
 # explicitly which environment variables to set in addition to the set
 # it sets anyway.
 
-if "$run_yarns" && command -v yarn > /dev/null
-then
-    yarn --env "PYTHONPATH=$PYTHONPATH" --env "TMPDIR=$TMPDIR" $snapshot \
-    --tempdir "$TMPDIR" -s yarns/morph.shell-lib \
-        yarns/*.yarn
+if "$run_yarns"; then
+    if command -v yarn > /dev/null; then
+        yarn --env "PYTHONPATH=$PYTHONPATH" --env "TMPDIR=$TMPDIR" $snapshot \
+        --tempdir "$TMPDIR" -s yarns/morph.shell-lib \
+            yarns/*.yarn
+    else
+        echo "WARNING: 'yarn' scenario test tool (part of 'cmdtest' " \
+             "package) was not found." >&2
+        echo "Not running Yarn tests." >&2
+    fi
 fi
diff --git a/setup.py b/setup.py
index 6d0bbcab..29e52d12 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2014-2015  Codethink Limited
+# Copyright (C) 2011,2014-2016  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -128,7 +128,10 @@ class Check(Command):
         subprocess.check_call(['python', '-m', 'CoverageTestRunner',
                                '--ignore-missing-from=without-test-modules',
                                'morphlib', 'distbuild'])
-        os.remove('.coverage')
+        try:
+            os.remove('.coverage')
+        except OSError:
+            pass
 
 
 setup(name='morph',
-- 
cgit v1.2.1