changeing to automaticly build the .png output, if graphvis available in path

Author: Israel Fruchter (ifruchte)

README.rst

@@ -50,6 +50,8 @@ Output can look like this:
 You can also generate the usage fixture graph like that:
 
 .. sourcecode::
+    # on windows gitbash as example
+    export PATH=$PATH:/c/Program\ Files\ \(x86\)/Graphviz2.38/bin/
     pytest --fixture-graph -s
 
 The Output would be like that:
@@ -67,8 +69,7 @@ The Output would be like that:
    tests\conftest.py .                                                      [ 57%]
    tests\test_fixture_duplicates.py .
    -------------------------------- fixture-graph --------------------------------
-   created at artifacts/fixture-graph-tests-test_fixture_duplicates.py__test_there_are_not_fixture_duplicates.dot.
-   You can convert it to a PNG using 'dot -Tpng artifacts/fixture-graph-tests-test_fixture_duplicates.py__test_there_are_not_fixture_duplicates.dot -o artifacts/fixture-graph-tests-test_fixture_duplicates.py__test_there_are_not_fixture_duplicates.png'
+   created artifacts/fixture-graph-tests-test_fixture_duplicates.py__test_there_are_fixture_duplicates.png.
    ============================= test session starts =============================
    platform win32 -- Python 2.7.10, pytest-3.3.1, py-1.5.2, pluggy-0.6.0
    rootdir: c:\users\ifruchte\appdata\local\temp\pytest-of-ifruchte\pytest-445\test_there_are_not_fixture_duplicates0, inifile:
@@ -80,11 +81,6 @@ The Output would be like that:
 
    ===================== 6 passed, 1 skipped in 0.29 seconds =====================
 
-And running the hinted command:
-
-.. sourcecode::
-    dot -Tpng artifacts/fixture-graph-tests-test_fixture_duplicates.py__test_there_are_not_fixture_duplicates.dot -o artifacts/fixture-graph-tests-test_fixture_duplicates.py__test_there_are_not_fixture_duplicates.png
-
 would provide this output, that can help under a test that depend on large amount of fixtures:
 
 .. image:: imgs/graph_example.png

imgs/graph_example.png

@@ -32,9 +32,16 @@ def pytest_addoption(parser):
     group.addoption('--fixture',
                     action="store", type=str, dest="fixture_name", default='',
                     help="Name of specific fixture for which you want to get duplicates")
+
     group.addoption('--fixture-graph',
                     action="store_true", dest="fixture_graph", default=False,
                     help="create .dot fixture graph for each test")
+    group.addoption('--fixture-graph-output-dir',
+                    action="store_true", dest="fixture_graph_output_dir", default="artifacts",
+                    help="select the location for the output of fixture graph. defaults to 'artifacts'")
+    group.addoption('--fixture-graph-output-type',
+                    action="store_true", dest="fixture_graph_output_type", default="png",
+                    help="select the type of the output for the fixture graph. defaults to 'png'")
 
 
 def pytest_cmdline_main(config):
@@ -138,11 +145,17 @@ def pytest_runtest_setup(item):
                 edge = pydot.Edge(node, i)
                 graph.add_edge(edge)
 
-        log_dir = os.environ.get('LOG_DEST_DIR', 'artifacts')
+        log_dir = item.config.option.fixture_graph_output_dir
+        output_type = item.config.option.fixture_graph_output_type
         mkdir_recursive(log_dir)
         filename = "{0}/fixture-graph-{1}".format(log_dir, item._nodeid.replace(":", "_").replace("/", "-"))
-        graph.write(filename + ".dot")
         tw.line()
         tw.sep("-", "fixture-graph")
-        tw.line("created at {}.dot.".format(filename))
-        tw.line("You can convert it to a PNG using 'dot -Tpng {0}.dot -o {0}.png'".format(filename))
+        try:
+            graph.write("{}.{}".format(filename, output_type), format=output_type)
+            tw.line("created {}.{}.".format(filename, output_type))
+        except Exception:
+            tw.line("grpahvis wasn't found in PATH")
+            graph.write(filename + ".dot")
+            tw.line("created {}.dot.".format(filename))
+            tw.line("You can convert it to a PNG using:\n\t'dot -Tpng {0}.dot -o {0}.png'".format(filename))

pytest_fixture_tools/plugin.py

@@ -24,12 +24,5 @@ def arg1(request):
 
     result = testdir.runpytest_subprocess('--fixture-graph', '-s')
 
-    result.stdout.fnmatch_lines("created at artifacts/fixture-graph-sub1-test_in_sub1.py__test_1.dot.")
-    result.stdout.fnmatch_lines("You can convert it to a PNG using 'dot -Tpng artifacts/fixture-graph-sub1"
-                                "-test_in_sub1.py__test_1.dot -o artifacts/fixture-graph-sub1-test_in_sub1"
-                                ".py__test_1.png'")
-
-    result.stdout.fnmatch_lines("created at artifacts/fixture-graph-sub1-sub2-test_in_sub2.py__test_2.dot.")
-    result.stdout.fnmatch_lines("You can convert it to a PNG using 'dot -Tpng artifacts/fixture-graph-sub1"
-                                "-sub2-test_in_sub2.py__test_2.dot -o artifacts/fixture-graph-sub1-sub2-te"
-                                "st_in_sub2.py__test_2.png'")
+    result.stdout.fnmatch_lines("created artifacts/fixture-graph-sub1-test_in_sub1.py__test_1.dot.")
+    result.stdout.fnmatch_lines('created artifacts/fixture-graph-sub1-sub2-test_in_sub2.py__test_2.dot.')