Merge pull request #10 from rmbar/issue_4

rmbar · web-flow · commit 867a93ebd47a · 2017-07-22T21:54:50.000-05:00
#4 merge solution into master
diff --git a/src/main/python/accept.py b/src/main/python/accept.py
@@ -124,9 +124,8 @@ def run_shell_command(command: str, expected_exit: int, expected_stdout: str = N
     completed_process = subprocess.run(command, shell=True, stdout=subprocess.PIPE)
 
     if len(completed_process.stdout) > 0:
-        print(HEADER + "<begin stdout>" + END_COLOR)
-        print(completed_process.stdout.decode('utf-8'))
-        print(HEADER + "<end stdout>" + END_COLOR)
+        print(HEADER + "<begin stdout>" + END_COLOR + completed_process.stdout.decode('utf-8') +
+              HEADER + "<end stdout>" + END_COLOR)
 
     #
     # Check if the exit code and standard out match expectations if specified.
@@ -135,9 +134,9 @@ def run_shell_command(command: str, expected_exit: int, expected_stdout: str = N
 
     if expected_stdout is not None and expected_stdout != completed_process.stdout.decode('utf-8'):
         test_passed = False
-        print(FAIL + "<expected stdout>" + END_COLOR)
-        print(expected_stdout)
-        print(FAIL + "<expected stdout>" + END_COLOR)
+        print(FAIL + "<expected out>" + END_COLOR + expected_stdout + FAIL + "<end expected out>" + END_COLOR)
+        # n.b. we use the string "<expected out>" instead of "<expected stdout>" so same char length as "<begin stdout>"
+        # and thus lines up visually.
 
     if expected_exit is not None and expected_exit != completed_process.returncode:
         test_passed = False
diff --git a/tool_files/bash_tester/correct/echo_dog.txt b/tool_files/bash_tester/correct/echo_dog.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_dog.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [92m[PASSED]
 [0m
diff --git a/tool_files/bash_tester/correct/echo_dog_legacy.txt b/tool_files/bash_tester/correct/echo_dog_legacy.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_dog_legacy.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [92m[PASSED]
 [0m
diff --git a/tool_files/bash_tester/correct/echo_exit_0.txt b/tool_files/bash_tester/correct/echo_exit_0.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_exit_0.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [92m[PASSED]
 [0m
diff --git a/tool_files/bash_tester/correct/echo_exit_0_legacy.txt b/tool_files/bash_tester/correct/echo_exit_0_legacy.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_exit_0_legacy.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [92m[PASSED]
 [0m
diff --git a/tool_files/bash_tester/correct/echo_exit_1.txt b/tool_files/bash_tester/correct/echo_exit_1.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_exit_1.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [91m<expected error code 1 but found 0>[0m
 [91m[FAILED]
diff --git a/tool_files/bash_tester/correct/echo_exit_1_legacy.txt b/tool_files/bash_tester/correct/echo_exit_1_legacy.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_exit_1_legacy.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [91m<expected error code 1 but found 0>[0m
 [91m[FAILED]
diff --git a/tool_files/bash_tester/correct/echo_just_command.txt b/tool_files/bash_tester/correct/echo_just_command.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_just_command.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [92m[PASSED]
 [0m
diff --git a/tool_files/bash_tester/correct/echo_just_command_legacy.txt b/tool_files/bash_tester/correct/echo_just_command_legacy.txt
@@ -16,9 +16,7 @@ found 1 tests.
 [0m
 [95m[running: tests/echo_just_command_legacy.test][0m
 [95mshell command: echo dog[0m
-[95m<begin stdout>[0m
-dog
-
+[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [92m[PASSED]
 [0m

-Original file line number
+Diff line change
 [0m
 [95m[running: tests/echo_dog.test][0m
 [95mshell command: echo dog[0m
 -[95m<begin stdout>[0m
 -dog
+-
 +[95m<begin stdout>[0mdog
 [95m<end stdout>[0m
 [92m[PASSED]
 [0m