fix: показывать вывод программы студента на панели «вывод»

modules/10-basics/10-hello-world/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "Hello, World!"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/10-basics/30-instructions/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "Заказ №1337\nСтатус: доставляется\nПримерный срок: 2 дня"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/10-basics/40-testing/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "10"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/10-basics/50-syntax-errors/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "Программа успешно запущена"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/20-arithmetics/20-basic/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "9.0"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/20-arithmetics/25-operator/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "87\n29.0"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/20-arithmetics/27-commutativity/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "256\n3.0"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/20-arithmetics/30-composition/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "660"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/20-arithmetics/40-priority/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "160.0"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/20-arithmetics/43-float/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "0.30000000000000004"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/20-arithmetics/45-linting/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "4"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/25-strings/10-quotes/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = 'The file "user\'s_config.json" was not found.'
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/25-strings/15-escape-characters/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = 'Для разделения строк используйте "\\n"\nПример: print("строка1\\nстрока2")'
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/25-strings/20-string-concatenation/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "https://github.com/hexlet/exercises-python"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/25-strings/30-encoding/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "~\n^\n%"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/30-variables/10-definition/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "https://hexlet.io\nhttps://hexlet.io"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected

modules/30-variables/12-change/test_solution.py

@@ -1,8 +1,18 @@
-import runpy
+import importlib
 
 
 def test(capsys):
     expected = "доставлен"
-    runpy.run_module('solution')
-    out, _ = capsys.readouterr()
-    assert out.strip() == expected
+    expect_output(capsys, expected)
+
+
+def expect_output(capsys, expected):
+    importlib.import_module('solution')
+    out, _err = capsys.readouterr()
+    actual = out.strip('\n')
+
+    with capsys.disabled():
+        print('\n')
+        print(out)
+
+    assert actual == expected