From bb139ecf1b9de3b221ff1d93c26190a8623d5d33 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Thu, 3 Mar 2016 10:27:03 +0000
Subject: Fix some test failures

These seem to have been introduced by commit fb6dd955cbc7081f47dc4391.

Change-Id: I2fb0be5f8829722264f3509f4db9473d19ea2939
---
 morphlib/morphloader.py    | 13 ++++++++-----
 yarns/implementations.yarn |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index 1158155c..668b133e 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -597,11 +597,14 @@ class MorphologyLoader(object):
 
     @classmethod
     def _validate_commands(cls, morphology_name, key, commands, errors):
-            for cmd_index, cmd in enumerate(commands):
-                if not isinstance(cmd, basestring):
-                    e = InvalidTypeError('%s[%d]' % (key, cmd_index),
-                                         str, type(cmd), morphology_name)
-                    errors.append(e)
+        if commands is None:
+            return
+
+        for cmd_index, cmd in enumerate(commands):  # pragma: no cover
+            if not isinstance(cmd, basestring):
+                e = InvalidTypeError('%s[%d]' % (key, cmd_index),
+                                        str, type(cmd), morphology_name)
+                errors.append(e)
 
     @classmethod
     def _validate_products(cls, morphology_name, products, errors):
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 45bb2058..bd56bee1 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -860,7 +860,7 @@ Implementations for building systems
     - echo dummy configure
     build-commands:
     - echo The next command will fail
-    - false
+    - 'false'
     EOF
     git add "${chunk_name}".morph
     git commit -m "Update ${chunk_name} build commands"
-- 
cgit v1.2.1