diff options
author | RĂ©mi Duraffort <remi.duraffort@linaro.org> | 2018-06-18 11:32:42 +0200 |
---|---|---|
committer | Remi Duraffort <remi.duraffort@linaro.org> | 2018-06-27 08:38:51 +0000 |
commit | 427d2235a72a0a16e0387dec6ca5394ededd2fa5 (patch) | |
tree | 7da71ba7bd678e79b7fa460973d294224fbb760d | |
parent | 7846b52dd9e9d17f519d0aef8241fa6267ae4d4f (diff) |
Change-Id: Ia00cfe9c20938fd861d39d824eb5abceddd87243
-rw-r--r-- | lavacli/__init__.py | 4 | ||||
-rw-r--r-- | lavacli/commands/devices.py | 2 | ||||
-rw-r--r-- | lavacli/commands/identities.py | 6 | ||||
-rw-r--r-- | lavacli/commands/results.py | 2 | ||||
-rw-r--r-- | tests/test_identities.py | 14 | ||||
-rw-r--r-- | tests/test_jobs.py | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/lavacli/__init__.py b/lavacli/__init__.py index b32a3b2..5cc7ef6 100644 --- a/lavacli/__init__.py +++ b/lavacli/__init__.py @@ -98,7 +98,7 @@ def load_config(identity): try: with open(config_filename, "r", encoding="utf-8") as f_conf: - config = yaml.load(f_conf.read()) + config = yaml.safe_load(f_conf.read()) return config[identity] except (FileNotFoundError, KeyError, TypeError): return {} @@ -176,7 +176,7 @@ def main(): config = {} # Skip when sub_command is "identities" - if remaining[0] != "identities": + if remaining[0] not in ["identities", "utils"]: if uri is None: config = load_config(options.identity) if config.get("uri") is None: diff --git a/lavacli/commands/devices.py b/lavacli/commands/devices.py index cc16125..b2a1af9 100644 --- a/lavacli/commands/devices.py +++ b/lavacli/commands/devices.py @@ -219,7 +219,7 @@ def handle_dict(proxy, options, _): return 0 if options.render: - value = yaml.load(str(config)) + value = yaml.safe_load(str(config)) return _lookups(value, options.field.split(".")) else: # Extract some variables diff --git a/lavacli/commands/identities.py b/lavacli/commands/identities.py index 0655f4d..fcc5e75 100644 --- a/lavacli/commands/identities.py +++ b/lavacli/commands/identities.py @@ -64,7 +64,7 @@ def _load_configuration(): try: with open(config_filename, "r", encoding="utf-8") as f_conf: - data = yaml.load(f_conf.read()) + data = yaml.safe_load(f_conf.read()) if not isinstance(data, dict): raise ConfigurationError("Invalid configuration file") return data @@ -78,7 +78,7 @@ def _save_configuration(config): "lavacli.yaml")) with open(config_filename, "w", encoding="utf-8") as f_conf: - f_conf.write(yaml.dump(config, default_flow_style=False).rstrip("\n")) + f_conf.write(yaml.safe_dump(config, default_flow_style=False).rstrip("\n")) def handle_add(_, options): @@ -117,7 +117,7 @@ def handle_list(_, __): def handle_show(_, options): config = _load_configuration() try: - conf_str = yaml.dump(config[options.id], default_flow_style=False) + conf_str = yaml.safe_dump(config[options.id], default_flow_style=False) print(conf_str.rstrip('\n')) return 0 except KeyError: diff --git a/lavacli/commands/results.py b/lavacli/commands/results.py index 47735e5..852ecec 100644 --- a/lavacli/commands/results.py +++ b/lavacli/commands/results.py @@ -50,7 +50,7 @@ def handle(proxy, options, _): else: data = proxy.results.get_testjob_results_yaml(options.job_id) - results = yaml.load(data) + results = yaml.safe_load(data) if options.output_format == "json": print(json.dumps(results)) diff --git a/tests/test_identities.py b/tests/test_identities.py index 4c1fb0b..2c34ee5 100644 --- a/tests/test_identities.py +++ b/tests/test_identities.py @@ -31,7 +31,7 @@ def test_identities_add(setup, monkeypatch, capsys, tmpdir): assert capsys.readouterr()[0] == "" with open(str(tmpdir / "lavacli.yaml")) as f_in: - data = yaml.load(f_in) + data = yaml.safe_load(f_in) assert set(data.keys()) == set(["default", "v.l.o"]) assert data["default"] == {"uri": "https://lava.example.com/RPC2"} assert data["v.l.o"] == {"uri": "https://validation.linaro.org/RPC2"} @@ -48,7 +48,7 @@ def test_identities_add_1(setup, monkeypatch, capsys, tmpdir): assert capsys.readouterr()[0] == "" with open(str(tmpdir / "lavacli.yaml")) as f_in: - data = yaml.load(f_in) + data = yaml.safe_load(f_in) assert set(data.keys()) == set(["default", "v.l.o"]) assert data["default"] == {"uri": "https://lava.example.com/RPC2"} assert data["v.l.o"] == {"uri": "https://validation.linaro.org/RPC2", @@ -65,7 +65,7 @@ def test_identities_add_empty_config(setup, monkeypatch, capsys, tmpdir): assert capsys.readouterr()[0] == "" with open(str(tmpdir / "lavacli.yaml")) as f_in: - data = yaml.load(f_in) + data = yaml.safe_load(f_in) assert set(data.keys()) == set(["v.l.o"]) assert data["v.l.o"] == {"uri": "https://validation.linaro.org/RPC2"} @@ -79,7 +79,7 @@ def test_identities_delete(setup, monkeypatch, capsys, tmpdir): assert capsys.readouterr()[0] == "" with open(str(tmpdir / "lavacli.yaml")) as f_in: - data = yaml.load(f_in) + data = yaml.safe_load(f_in) assert list(data.keys()) == ["default"] assert data["default"] == {"uri": "https://lava.example.com/RPC2"} @@ -100,7 +100,7 @@ def test_identities_delete_missing_key(setup, monkeypatch, capsys, tmpdir): assert capsys.readouterr()[0] == "Unknown identity 'v.l.o'\n" with open(str(tmpdir / "lavacli.yaml")) as f_in: - data = yaml.load(f_in) + data = yaml.safe_load(f_in) assert list(data.keys()) == ["default"] assert data["default"] == {"uri": "https://lava.example.com/RPC2"} @@ -112,7 +112,7 @@ def test_identities_list(setup, monkeypatch, capsys, tmpdir): assert capsys.readouterr()[0] == "Identities:\n* default\n" with open(str(tmpdir / "lavacli.yaml")) as f_in: - data = yaml.load(f_in) + data = yaml.safe_load(f_in) assert list(data.keys()) == ["default"] assert data["default"] == {"uri": "https://lava.example.com/RPC2"} @@ -126,7 +126,7 @@ def test_identities_list_1(setup, monkeypatch, capsys, tmpdir): assert capsys.readouterr()[0] == "Identities:\n* default\n* v.l.o\n" with open(str(tmpdir / "lavacli.yaml")) as f_in: - data = yaml.load(f_in) + data = yaml.safe_load(f_in) assert set(data.keys()) == set(["default", "v.l.o"]) assert data["default"] == {"uri": "https://lava.example.com/RPC2"} assert data["v.l.o"] == {"uri": "https://validation.linaro.org/RPC2"} diff --git a/tests/test_jobs.py b/tests/test_jobs.py index 9962287..65ed27c 100644 --- a/tests/test_jobs.py +++ b/tests/test_jobs.py @@ -225,7 +225,7 @@ def test_jobs_logs(setup, monkeypatch, capsys): assert lines[0] == "2018-04-23T12:07:02 lava-dispatcher, installed at version: 2018.4-1" assert lines[1][:20] == "2018-04-23T12:07:02 " print(lines[1][20:]) - assert yaml.load(lines[1][20:]) == {'case': 'validate', 'definition': 'lava', 'result': 'pass'} + assert yaml.safe_load(lines[1][20:]) == {'case': 'validate', 'definition': 'lava', 'result': 'pass'} assert lines[2] == "2018-04-23T12:07:02 start: 1.1 download-retry (timeout 00:02:00) [common]" @@ -266,7 +266,7 @@ def test_jobs_logs_failure_comment_and_polling(setup, monkeypatch, capsys): lines = capsys.readouterr()[0].split("\n") assert lines[0] == "2018-04-23T12:07:02 lava-dispatcher, installed at version: 2018.4-1" assert lines[1][:20] == "2018-04-23T12:07:02 " - assert yaml.load(lines[1][20:]) == {'case': 'validate', 'definition': 'lava', 'result': 'pass'} + assert yaml.safe_load(lines[1][20:]) == {'case': 'validate', 'definition': 'lava', 'result': 'pass'} assert lines[2] == "2018-04-23T12:07:02 start: 1.1 download-retry (timeout 00:02:00) [common]" assert lines[3].endswith("lavacli] Failure comment: A small issue was found") @@ -519,7 +519,7 @@ def test_jobs_run(setup, monkeypatch, capsys, tmpdir): assert lines[0].endswith("[lavacli] Job 4567 submitted") assert lines[1] == "2018-04-23T12:07:02 lava-dispatcher, installed at version: 2018.4-1" assert lines[2][:20] == "2018-04-23T12:07:02 " - assert yaml.load(lines[2][20:]) == {'case': 'validate', 'definition': 'lava', 'result': 'pass'} + assert yaml.safe_load(lines[2][20:]) == {'case': 'validate', 'definition': 'lava', 'result': 'pass'} assert lines[3] == "2018-04-23T12:07:02 start: 1.1 download-retry (timeout 00:02:00) [common]" |