Add meek_client stuff to CLI tests

This commit is contained in:
Miguel Jacq 2021-10-20 15:55:24 +11:00
parent 242312ba82
commit 1fa82818c3
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6

View File

@ -162,6 +162,9 @@ class TestGetTorPaths:
tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip") tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip")
tor_geo_ipv6_file_path = os.path.join(base_path, "Resources", "Tor", "geoip6") tor_geo_ipv6_file_path = os.path.join(base_path, "Resources", "Tor", "geoip6")
obfs4proxy_file_path = os.path.join(base_path, "Resources", "Tor", "obfs4proxy") obfs4proxy_file_path = os.path.join(base_path, "Resources", "Tor", "obfs4proxy")
meek_client_file_path = os.path.join(
base_path, "Resources", "Tor", "meek-client"
)
snowflake_file_path = os.path.join( snowflake_file_path = os.path.join(
base_path, "Resources", "Tor", "snowflake-client" base_path, "Resources", "Tor", "snowflake-client"
) )
@ -171,6 +174,7 @@ class TestGetTorPaths:
tor_geo_ipv6_file_path, tor_geo_ipv6_file_path,
obfs4proxy_file_path, obfs4proxy_file_path,
snowflake_file_path, snowflake_file_path,
meek_client_file_path,
) )
@pytest.mark.skipif(sys.platform != "linux", reason="requires Linux") @pytest.mark.skipif(sys.platform != "linux", reason="requires Linux")
@ -181,6 +185,7 @@ class TestGetTorPaths:
tor_geo_ipv6_file_path, tor_geo_ipv6_file_path,
_, # obfs4proxy is optional _, # obfs4proxy is optional
_, # snowflake-client is optional _, # snowflake-client is optional
_, # meek-client is optional
) = common_obj.get_tor_paths() ) = common_obj.get_tor_paths()
assert os.path.basename(tor_path) == "tor" assert os.path.basename(tor_path) == "tor"
@ -207,6 +212,9 @@ class TestGetTorPaths:
snowflake_file_path = os.path.join( snowflake_file_path = os.path.join(
os.path.join(base_path, "Tor"), "snowflake-client.exe" os.path.join(base_path, "Tor"), "snowflake-client.exe"
) )
meek_client_file_path = os.path.join(
os.path.join(base_path, "Tor"), "meek-client.exe"
)
tor_geo_ip_file_path = os.path.join( tor_geo_ip_file_path = os.path.join(
os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip" os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip"
) )
@ -219,6 +227,7 @@ class TestGetTorPaths:
tor_geo_ipv6_file_path, tor_geo_ipv6_file_path,
obfs4proxy_file_path, obfs4proxy_file_path,
snowflake_file_path, snowflake_file_path,
meek_client_file_path,
) )