Use safe_dump to generate yaml without tags

DonnchaC · Dec 13, 2016 · 9f02060 · 9f02060
1 parent 26c78af
commit 9f02060
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/onionbalance/settings.py b/onionbalance/settings.py
@@ -328,7 +328,7 @@ def generate_config():
                                   'name': '{}{}'.format(tag, i+1)} for
                                  i, (address, _) in enumerate(instances)]
     settings_data = {'services': [service_data]}
-    config_yaml = yaml.dump(settings_data, default_flow_style=False)
+    config_yaml = yaml.safe_dump(settings_data, default_flow_style=False)
 
     config_file_path = os.path.join(master_dir, 'config.yaml')
     with open(config_file_path, "w") as config_file:

diff --git a/test/functional/test_onionbalance_config.py b/test/functional/test_onionbalance_config.py
@@ -64,6 +64,9 @@ def check_basic_config_output(config_dir):
     config_file = config_dir.join('master', 'config.yaml').read_text('utf-8')
     assert all(address in config_file for address in instance_addresses)
 
+    # Test that all addresses are encoded as bytes and not unicode
+    assert "!!python/unicode" not in config_file
+
     return True