[tor-commits] [sbws/master] Change the path of the v3bw files to a dir too

[pastly at torproject.org]

commit 3de8eeda75c25530ae05d4e28b6b2f633bbde15a
Author: juga0 <juga at riseup.net>
Date:   Thu Jun 14 15:00:45 2018 +0000

    Change the path of the v3bw files to a dir too
    
    It does not change functionality right now, but probably needed
    for future tests
---
 tests/unit/lib/data/{v3bw.txt => v3bw/20180425_131057.v3bw} | 0
 tests/unit/lib/test_v3bwfile.py                             | 6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/unit/lib/data/v3bw.txt b/tests/unit/lib/data/v3bw/20180425_131057.v3bw
similarity index 100%
rename from tests/unit/lib/data/v3bw.txt
rename to tests/unit/lib/data/v3bw/20180425_131057.v3bw
diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py
index ca47a2b..e18278d 100644
--- a/tests/unit/lib/test_v3bwfile.py
+++ b/tests/unit/lib/test_v3bwfile.py
@@ -125,7 +125,8 @@ def test_v3bwheader_from_file(datadir):
                         file_created=file_created,
                         generator_started=generator_started,
                         earliest_bandwidth=earliest_bandwidth)
-    text = datadir.read('v3bw.txt')
+    # at some point this should be read from conftest
+    text = datadir.read('v3bw/20180425_131057.v3bw')
     h, _ = V3BwHeader.from_text_v110(text)
     assert str(h) == str(header)
 
@@ -156,7 +157,8 @@ def test_v3bwline_from_results_file(datadir):
 
 def test_v3bwfile(datadir, tmpdir):
     """Test generate v3bw file (including relay_lines)."""
-    v3bw = datadir.read('v3bw.txt')
+    # at some point this should be obtained from conftest
+    v3bw = datadir.read('v3bw/20180425_131057.v3bw')
     results = load_result_file(str(datadir.join("results.txt")))
     header = V3BwHeader(timestamp_l,
                         file_created=file_created,