Fix error test and output for ignore files

avirshup · Sep 27, 2017 · 4aea418 · 4aea418
1 parent c3a56b4
commit 4aea418
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/dockermake/imagedefs.py b/dockermake/imagedefs.py
@@ -97,8 +97,9 @@ def _check_yaml_and_paths(ymlfilepath, yamldefs):
             defn['_sourcefile'] = relpath
 
             if 'ignore' in defn and 'ignorefile' in defn:
-                raise errors.MultipleIgnoreError('Image "%s" has both "ignore" AND "ignorefile"'
-                                                 ' fields. At most ONE of these should be defined')
+                raise errors.MultipleIgnoreError(
+                        'Image "%s" has both "ignore" AND "ignorefile" fields.' % imagename +
+                        ' At most ONE of these should be defined')
 
             for key in defn:
                 if key not in RECOGNIZED_KEYS:

diff --git a/test/test_errors.py b/test/test_errors.py
@@ -14,7 +14,7 @@
     'data/baddockerfile.yml': errors.ExternalBuildError,
     'data/invalid_requires.yml': errors.InvalidRequiresList,
     'data/invalid_yaml.yml': errors.ParsingFailure,
-    'data/multi_ignore': errors.MultipleIgnoreError,
+    'data/multi_ignore.yml': errors.MultipleIgnoreError,
 }