[tor-commits] [onionperf/master] Fixes tests where there is no private data directory

[irl at torproject.org]

commit 9b61532419334f8bf21b469a412292a0a78c507b
Author: Ana Custura <ana at netstat.org.uk>
Date:   Tue May 21 15:37:14 2019 +0100

    Fixes tests where there is no private data directory
---
 onionperf/tests/test_measurement.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/onionperf/tests/test_measurement.py b/onionperf/tests/test_measurement.py
index 6db36a4..1898cbf 100644
--- a/onionperf/tests/test_measurement.py
+++ b/onionperf/tests/test_measurement.py
@@ -29,7 +29,7 @@ def test_create_tor_config_env_var():
     """
 
     os.environ["BASETORRC"] = "UseBridges 1\n"
-    meas = measurement.Measurement(None, None, None, None, None, None, None,
+    meas = measurement.Measurement(None, None, None, None, None, None, None, None,
                                    None)
     known_config = "UseBridges 1\nRunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\
 WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\n"
@@ -57,7 +57,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory
     known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\
 WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0"
 
-    meas = measurement.Measurement(None, None, None, None, None,
+    meas = measurement.Measurement(None, None, None, None, None, None,
                                    "UseBridges 1\n", None, None)
     config_client = meas.create_tor_config(9001, 9050, "/tmp/", "client")
     config_server = meas.create_tor_config(9001, 9050, "/tmp/", "server")
@@ -80,7 +80,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory
     known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\
 WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseBridges 1\n"
 
-    meas = measurement.Measurement(None, None, None, None, None, None,
+    meas = measurement.Measurement(None, None, None, None, None, None, None,
                                    absolute_data_path("config"), None)
     config_client = meas.create_tor_config(9001, 9050, "/tmp/", "client")
     config_server = meas.create_tor_config(9001, 9050, "/tmp/", "server")
@@ -103,7 +103,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory
     known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\
 WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0"
 
-    meas = measurement.Measurement(None, None, None, None, None, None, None,
+    meas = measurement.Measurement(None, None, None, None, None, None, None, None,
                                    absolute_data_path("config"))
     config_client = meas.create_tor_config(9001, 9050, "/tmp/", "client")
     config_server = meas.create_tor_config(9001, 9050, "/tmp/", "server")