Remove file interleaving - where you say we should save, that's where…

… we'll save
bencheeorg · Jan 3, 2018 · c641352 · c641352
1 parent 04508db
commit c641352
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ elixir_build_*
 doc
 docs
 /test/tmp
+save.benchee
diff --git a/lib/benchee/configuration.ex b/lib/benchee/configuration.ex
@@ -9,7 +9,6 @@ defmodule Benchee.Configuration do
     Conversion.Duration,
     Conversion.Scale,
     Utility.DeepConvert,
-    Utility.FileCreation,
     Formatters.Console
   }
 
@@ -319,7 +318,7 @@ defmodule Benchee.Configuration do
 
     tagged_save_options = %{
       tag: save_options.tag,
-      path: FileCreation.interleave(save_options.path, save_options.tag)
+      path: save_options.path
     }
 
     %__MODULE__{config |

diff --git a/samples/save_and_load.exs b/samples/save_and_load.exs
@@ -16,7 +16,7 @@ Benchee.run(%{
   "map.flatten" => fn -> list |> Enum.map(map_fun) |> List.flatten end
 },
   time: 5,
-  load: "save_first-try.benchee",
+  load: "save.benchee",
   console: [extended_statistics: true]
 )
 

diff --git a/test/benchee/configuration_test.exs b/test/benchee/configuration_test.exs
@@ -38,7 +38,7 @@ defmodule Benchee.ConfigurationTest do
         Benchee.Formatters.Console, Benchee.Formatters.TaggedSave
       ]
       assert suite.configuration.formatter_options.tagged_save == %{
-        path: "save_one_master.benchee",
+        path: "save_one.benchee",
         tag:  "master"
       }
     end
@@ -49,7 +49,7 @@ defmodule Benchee.ConfigurationTest do
       etf_options = suite.configuration.formatter_options.tagged_save
 
       assert etf_options.tag =~ ~r/\d\d\d\d-\d\d?-\d\d?--\d\d?-\d\d?-\d\d?/
-      assert String.contains?(etf_options.path, etf_options.tag)
+      assert etf_options.path == "save_one.benchee"
     end
   end
 

diff --git a/test/benchee_test.exs b/test/benchee_test.exs
@@ -380,7 +380,7 @@ defmodule BencheeTest do
   describe "save & load" do
     test "saving the suite to disk and restoring it" do
       save = [save: [path: "save.benchee", tag: "master"]]
-      expected_file = "save_master.benchee"
+      expected_file = "save.benchee"
 
       try do
         configuration = Keyword.merge @test_times, save