Adjusted linting tests to use similar file name conventions as format tests

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>

Author: olehermanse

.gitignore

@@ -11,6 +11,7 @@ __pycache__
 /tmp/
 *.log
 *.output.cf
+*.output.txt
 git_diff_exists
 commit_message.txt
 black_output.txt

tests/lint/002_ifvarclass.output.txt tests/lint/002_ifvarclass.expected.txttests/lint/002_ifvarclass.output.txt renamed to tests/lint/002_ifvarclass.expected.txt

@@ -21,12 +21,12 @@ for file in tests/lint/*.cf; do
     #  - Fail (non-zero exit code)
     #  - Output the correct error message
 
-    expected="$(echo $file | sed 's/\.x\.cf$/.output.txt/')"
+    expected="$(echo $file | sed 's/\.x\.cf$/.expected.txt/')"
     if [ ! -f "$expected" ]; then
       echo "FAIL: Missing expected output file: $expected"
       exit 1
     fi
-    output="tmp/$(basename $file .x.cf).lint-output.txt"
+    output="tests/lint/$(basename $file .x.cf).output.txt"
     if cfengine lint "$file" > "$output" 2>&1; then
       echo "FAIL: $file - expected lint failure but got success"
       exit 1