]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
test/run: py3 compatibility
authorKyr Shatskyy <kyrylo.shatskyy@suse.com>
Wed, 20 Nov 2019 00:07:16 +0000 (01:07 +0100)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Thu, 21 Nov 2019 21:16:10 +0000 (22:16 +0100)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
teuthology/test/test_run.py

index 0657309175b4651b08596620782eeac92fb03b33..3510aa0b2da3cd99941486c68bdb150c5054b6dc 100644 (file)
@@ -32,7 +32,7 @@ class TestRun(object):
 
     @patch("teuthology.run.merge_configs")
     def test_setup_config_targets_ok(self, m_merge_configs):
-        config = {"targets": range(4), "roles": range(2)}
+        config = {"targets": list(range(4)), "roles": list(range(2))}
         m_merge_configs.return_value = config
         result = run.setup_config(["some/config.yaml"])
         assert result["targets"] == [0, 1, 2, 3]
@@ -45,7 +45,7 @@ class TestRun(object):
         with pytest.raises(AssertionError):
             run.setup_config(["some/config.yaml"])
 
-    @patch("__builtin__.open")
+    @patch("teuthology.run.open")
     def test_write_initial_metadata(self, m_open):
         config = {"job_id": "123", "foo": "bar"}
         run.write_initial_metadata(
@@ -121,7 +121,7 @@ class TestRun(object):
     @patch("yaml.safe_dump")
     @patch("teuthology.report.try_push_job_info")
     @patch("teuthology.run.email_results")
-    @patch("__builtin__.open")
+    @patch("teuthology.run.open")
     @patch("sys.exit")
     def test_report_outcome(self, m_sys_exit, m_open, m_email_results, m_try_push_job_info, m_safe_dump, m_nuke, m_get_status):
         m_get_status.return_value = "fail"