From a751023422eadf87cd8d6484878193a4914a9d85 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 26 Jul 2022 07:11:33 +0200 Subject: Adding upstream version 2.1~rc0. Signed-off-by: Daniel Baumann --- tests/nvme_attach_detach_ns_test.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'tests/nvme_attach_detach_ns_test.py') diff --git a/tests/nvme_attach_detach_ns_test.py b/tests/nvme_attach_detach_ns_test.py index 5ba0d48..07c118f 100644 --- a/tests/nvme_attach_detach_ns_test.py +++ b/tests/nvme_attach_detach_ns_test.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# # Copyright (c) 2015-2016 Western Digital Corporation or its affiliates. # # This program is free software; you can redistribute it and/or @@ -29,7 +31,6 @@ NVMe Namespace Management Testcase:- import time -from nose.tools import assert_equal from nvme_test import TestNVMe @@ -46,9 +47,9 @@ class TestNVMeAttachDetachNSCmd(TestNVMe): - ctrl_id : controller id. """ - def __init__(self): + def setUp(self): """ Pre Section for TestNVMeAttachDetachNSCmd """ - TestNVMe.__init__(self) + super().setUp() self.dps = 0 self.flbas = 0 self.nsze = 0x1400000 @@ -58,7 +59,7 @@ class TestNVMeAttachDetachNSCmd(TestNVMe): self.delete_all_ns() time.sleep(1) - def __del__(self): + def tearDown(self): """ Post Section for TestNVMeAttachDetachNSCmd @@ -66,13 +67,13 @@ class TestNVMeAttachDetachNSCmd(TestNVMe): - Atttach it to controller. - Call super class's destructor. """ - assert_equal(self.create_and_validate_ns(self.default_nsid, - self.nsze, - self.ncap, - self.flbas, - self.dps), 0) + self.assertEqual(self.create_and_validate_ns(self.default_nsid, + self.nsze, + self.ncap, + self.flbas, + self.dps), 0) self.attach_ns(self.ctrl_id, self.default_nsid) - TestNVMe.__del__(self) + super().tearDown() def test_attach_detach_ns(self): """ Testcase main """ @@ -81,11 +82,11 @@ class TestNVMeAttachDetachNSCmd(TestNVMe): self.ncap, self.flbas, self.dps) - assert_equal(err, 0) - assert_equal(self.attach_ns(self.ctrl_id, self.default_nsid), 0) + self.assertEqual(err, 0) + self.assertEqual(self.attach_ns(self.ctrl_id, self.default_nsid), 0) self.run_ns_io(self.default_nsid, 0) - assert_equal(self.detach_ns(self.ctrl_id, self.default_nsid), 0) - assert_equal(self.delete_and_validate_ns(self.default_nsid), 0) + self.assertEqual(self.detach_ns(self.ctrl_id, self.default_nsid), 0) + self.assertEqual(self.delete_and_validate_ns(self.default_nsid), 0) self.nvme_reset_ctrl() -- cgit v1.2.3