Test snippet format matches a directory it is in

(see commit cfc7e52)
An UltiSnips snippet was added into "snippets" directory which should
contain snipmate snippets only. This led to a parsing bug in UltiSnips.

Author: EgZvor

UltiSnips/python.snippets

@@ -278,7 +278,6 @@ write_init_body(args, t[2], snip)
 		$0
 endsnippet
 
-
 snippet slotclass "class with slots and docstrings" b
 class ${1:MyClass}(${2:object}):
 
@@ -664,6 +663,10 @@ snippet ann "Assert is not None" b
 self.assertIsNotNone(${1:${VISUAL:expression}})
 endsnippet
 
+snippet sk "skip unittests" b
+@unittest.skip(${1:skip_reason})
+endsnippet
+
 snippet testcase "pyunit testcase" b
 class Test${1:Class}(${2:unittest.TestCase}):
 

snippets/python.snippets

@@ -22,11 +22,6 @@ snippet docs
 	Description: ${0}
 	"""
 
-# Unittest skip
-snippet sk "skip unittests" b
-@unittest.skip(${1:skip_reason})
-endsnippet
-
 snippet wh
 	while ${1:condition}:
 		${0:${VISUAL}}

tests.sh

@@ -1,15 +1,37 @@
 #!/usr/bin/env bash
 
-SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets)
-
-if [[ $? -ne 1 ]]; then
-  echo These snippet lines are indented with spaces:
-  echo
-  echo "$SPACED"
-  echo
-  echo Tests failed!
+check=0
+
+function test_space_indented {
+  local spaced
+  spaced=$(grep -REn '^ ' --include '*.snippets' snippets)
+
+  if [[ $? -ne 1 ]]; then
+    echo "These snippet lines are indented with spaces:"
+    echo "$spaced"
+    echo
+    (( check++ ))
+  fi
+}
+
+function test_snipmate_format {
+  local ultisnips_in_snipmate
+  ultisnips_in_snipmate=$(grep -REn 'endsnippet' --include '*.snippets' snippets)
+  if [[ $? -ne 1 ]]; then
+    echo "These snippet definitions are probably in UltiSnips format but stored in the snipmate directory"
+    echo "$ultisnips_in_snipmate"
+    echo
+    (( check++ ))
+  fi
+}
+
+test_space_indented
+test_snipmate_format
+
+if [ $check -eq 0 ]; then
+  echo "Tests passed!"
+  exit 0
+else
+  echo "$check test(s) failed out of 2!"
   exit 1
 fi
-
-echo Tests passed!
-exit 0