diff options
Diffstat (limited to 'lava_dispatcher/test/test_removable.py')
| -rw-r--r-- | lava_dispatcher/test/test_removable.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lava_dispatcher/test/test_removable.py b/lava_dispatcher/test/test_removable.py index 9d4ce8c8a..49fb16a52 100644 --- a/lava_dispatcher/test/test_removable.py +++ b/lava_dispatcher/test/test_removable.py @@ -41,8 +41,8 @@ class RemovableFactory(Factory): # pylint: disable=too-few-public-methods def create_job(self, sample_job, device_file): # pylint: disable=no-self-use device = NewDevice(os.path.join(os.path.dirname(__file__), device_file)) - yaml = os.path.join(os.path.dirname(__file__), sample_job) - with open(yaml) as sample_job_data: + j_yaml = os.path.join(os.path.dirname(__file__), sample_job) + with open(j_yaml) as sample_job_data: parser = JobParser() job = parser.parse(sample_job_data, device, 4212, None, "") job.logger = DummyLogger() @@ -60,7 +60,7 @@ class TestRemovable(StdoutTestCase): # pylint: disable=too-many-public-methods Test that the correct parameters have been set for the device """ (rendered, _) = self.factory.create_device('cubie2.jinja2') - cubie = NewDevice(yaml.load(rendered)) + cubie = NewDevice(yaml.safe_load(rendered)) self.assertIsNotNone(cubie['parameters']['media'].get('usb')) self.assertIsNotNone(cubie.get('commands')) self.assertIsNotNone(cubie.get('actions')) @@ -113,7 +113,7 @@ class TestRemovable(StdoutTestCase): # pylint: disable=too-many-public-methods Test that the job parameters match expected structure """ (rendered, _) = self.factory.create_device('cubie1.jinja2') - cubie = NewDevice(yaml.load(rendered)) + cubie = NewDevice(yaml.safe_load(rendered)) job = self._check_valid_job(cubie, 'cubietruck-removable.yaml') self._check_job_parameters(cubie, job, 'download') @@ -122,7 +122,7 @@ class TestRemovable(StdoutTestCase): # pylint: disable=too-many-public-methods Test that the job parameters with a writer tool match expected structure """ (rendered, _) = self.factory.create_device('cubie1.jinja2') - cubie = NewDevice(yaml.load(rendered)) + cubie = NewDevice(yaml.safe_load(rendered)) job = self._check_valid_job(cubie, 'cubietruck-removable-with-writer.yaml') self._check_job_parameters(cubie, job, 'writer') @@ -159,12 +159,12 @@ class TestRemovable(StdoutTestCase): # pylint: disable=too-many-public-methods def test_deployment(self): (rendered, _) = self.factory.create_device('cubie1.jinja2') - cubie = NewDevice(yaml.load(rendered)) + cubie = NewDevice(yaml.safe_load(rendered)) self._check_deployment(cubie, 'cubietruck-removable.yaml') def test_writer_deployment(self): (rendered, _) = self.factory.create_device('cubie1.jinja2') - cubie = NewDevice(yaml.load(rendered)) + cubie = NewDevice(yaml.safe_load(rendered)) self._check_deployment(cubie, 'cubietruck-removable-with-writer.yaml') def test_juno_deployment(self): @@ -243,7 +243,7 @@ class TestRemovable(StdoutTestCase): # pylint: disable=too-many-public-methods """ job_parser = JobParser() (rendered, _) = self.factory.create_device('bbb-01.jinja2') - bbb = NewDevice(yaml.load(rendered)) + bbb = NewDevice(yaml.safe_load(rendered)) sample_job_file = os.path.join(os.path.dirname(__file__), 'sample_jobs/uboot-ramdisk.yaml') with open(sample_job_file) as sample_job_data: job = job_parser.parse(sample_job_data, bbb, 4212, None, "") @@ -262,7 +262,7 @@ class TestRemovable(StdoutTestCase): # pylint: disable=too-many-public-methods """ job_parser = JobParser() (rendered, _) = self.factory.create_device('cubie1.jinja2') - cubie = NewDevice(yaml.load(rendered)) + cubie = NewDevice(yaml.safe_load(rendered)) sample_job_file = os.path.join(os.path.dirname(__file__), 'sample_jobs/cubietruck-removable.yaml') with open(sample_job_file) as sample_job_data: job = job_parser.parse(sample_job_data, cubie, 4212, None, "") |