Fix test suite for python < 3.6

Change-Id: I5438f6ee632d32053299cc22a28548c9ff36b81a

3 files changed, 16 insertions, 11 deletions

diff --git a/tests/test_aliases.py b/tests/test_aliases.py
index 7f41eca..30de521 100644
--- a/tests/test_aliases.py
+++ b/tests/test_aliases.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with lavacli.  If not, see <http://www.gnu.org/licenses/>
 
+import json
 import sys
 import xmlrpc.client
 
@@ -108,7 +109,7 @@ def test_aliases_show_json(setup, monkeypatch, capsys):
                                                              "args": ("my_alias", ),
                                                              "ret": {"name": "my_alias", "device_types": ["qemu", "kvm"]}}])
     assert main() == 0
-    assert capsys.readouterr().out == '{"name": "my_alias", "device_types": ["qemu", "kvm"]}\n'
+    assert json.loads(capsys.readouterr().out) == {"name": "my_alias", "device_types": ["qemu", "kvm"]}
 
 
 def test_aliases_show_yaml(setup, monkeypatch, capsys):
diff --git a/tests/test_identities.py b/tests/test_identities.py
index ebc36f8..da8a08c 100644
--- a/tests/test_identities.py
+++ b/tests/test_identities.py
@@ -32,7 +32,7 @@ def test_identities_add(setup, monkeypatch, capsys, tmpdir):
 
     with open(str(tmpdir / "lavacli.yaml")) as f_in:
         data = yaml.load(f_in)
-        assert list(data.keys()) == ["default", "v.l.o"]
+        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"}
 
@@ -49,7 +49,7 @@ def test_identities_add_1(setup, monkeypatch, capsys, tmpdir):
 
     with open(str(tmpdir / "lavacli.yaml")) as f_in:
         data = yaml.load(f_in)
-        assert list(data.keys()) == ["default", "v.l.o"]
+        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",
                                  "proxy": "http://proxy:3128",
@@ -66,7 +66,7 @@ def test_identities_add_empty_config(setup, monkeypatch, capsys, tmpdir):
 
     with open(str(tmpdir / "lavacli.yaml")) as f_in:
         data = yaml.load(f_in)
-        assert list(data.keys()) == ["v.l.o"]
+        assert set(data.keys()) == set(["v.l.o"])
         assert data["v.l.o"] == {"uri": "https://validation.linaro.org/RPC2"}
 
 
@@ -127,7 +127,7 @@ def test_identities_list_1(setup, monkeypatch, capsys, tmpdir):
 
     with open(str(tmpdir / "lavacli.yaml")) as f_in:
         data = yaml.load(f_in)
-        assert list(data.keys()) == ["default", "v.l.o"]
+        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 d8e5e1d..e96f6ab 100644
--- a/tests/test_jobs.py
+++ b/tests/test_jobs.py
@@ -221,10 +221,12 @@ def test_jobs_logs(setup, monkeypatch, capsys):
                                                                      "visibility": "Publicly visible",
                                                                      "failure_comment": None}}])
     assert main() == 0
-    assert capsys.readouterr().out == """2018-04-23T12:07:02 lava-dispatcher, installed at version: 2018.4-1
-2018-04-23T12:07:02 {'case': 'validate', 'definition': 'lava', 'result': 'pass'}
-2018-04-23T12:07:02 start: 1.1 download-retry (timeout 00:02:00) [common]
-"""
+    lines = capsys.readouterr().out.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 "
+    print(lines[1][20:])
+    assert yaml.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]"
 
 
 def test_jobs_logs_failure_comment_and_polling(setup, monkeypatch, capsys):
@@ -263,7 +265,8 @@ def test_jobs_logs_failure_comment_and_polling(setup, monkeypatch, capsys):
     assert main() == 0
     lines = capsys.readouterr().out.split("\n")
     assert lines[0] == "2018-04-23T12:07:02 lava-dispatcher, installed at version: 2018.4-1"
-    assert lines[1] == "2018-04-23T12:07:02 {'case': 'validate', 'definition': 'lava', 'result': 'pass'}"
+    assert lines[1][:20] == "2018-04-23T12:07:02 "
+    assert yaml.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")
 
@@ -515,7 +518,8 @@ def test_jobs_run(setup, monkeypatch, capsys, tmpdir):
     lines = capsys.readouterr().out.split("\n")
     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] == "2018-04-23T12:07:02 {'case': 'validate', 'definition': 'lava', 'result': 'pass'}"
+    assert lines[2][:20] == "2018-04-23T12:07:02 "
+    assert yaml.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]"