laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38369?usp=email ) Change subject: pySim-shell_test: re-enable test_list_and_rm_notif ...................................................................... pySim-shell_test: re-enable test_list_and_rm_notif The problems with test_list_and_rm_notif (see also change id I7d0b6a998499d84f0eb4e24592ad43210ac54806) are now resolved, so we can re-enable the testcase now. Closes: SYS#7094 Change-Id: I95eb3b9c02a69653797851197e882ea9316805fc --- M tests/pySim-shell_test/euicc/test.py 1 file changed, 28 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/tests/pySim-shell_test/euicc/test.py b/tests/pySim-shell_test/euicc/test.py index f7226a3..b634f22 100644 --- a/tests/pySim-shell_test/euicc/test.py +++ b/tests/pySim-shell_test/euicc/test.py @@ -62,34 +62,34 @@ self.runPySimShell(cardname, "test_set_nickname.script") self.assertEqualFiles("set_nickname.tmp") -# def test_list_and_rm_notif(self): -# cardname = 'sysmoEUICC1-C2T' -# -# # Generate two (additional) notification -# self.runPySimShell(cardname, "test_gen_notif.script") -# -# # List notifications into a file -# self.runPySimShell(cardname, "test_list_notif.script") -# -# # Parse notifications file (JSON) -# notifications_tmp = open("notifications.tmp") -# notifications = json.load(notifications_tmp) -# notifications_tmp.close() -# -# # Delete notifications one by one, we expect to see at least one notification -# notification_metadata_list = notifications['notification_metadata_list'] -# removed = 0 -# for nm in notification_metadata_list: -# seq_number = nm['notification_metadata']['seq_number'] -# print("removing notification with seq_number %s:" % seq_number) -# self.equipTemplate("test_rm_notif.script", SEQ_NUMBER = seq_number) -# self.runPySimShell(cardname, "test_rm_notif.script") -# removed = removed + 1 -# self.assertTrue(removed >= 2, "we expected to remove at least two notifications, but we have removed none!") -# -# # List notifications again, require none to be present -# self.runPySimShell(cardname, "test_list_notif.script") -# self.assertEqualFiles("notifications.tmp") + def test_list_and_rm_notif(self): + cardname = 'sysmoEUICC1-C2T' + + # Generate two (additional) notification + self.runPySimShell(cardname, "test_gen_notif.script") + + # List notifications into a file + self.runPySimShell(cardname, "test_list_notif.script") + + # Parse notifications file (JSON) + notifications_tmp = open("notifications.tmp") + notifications = json.load(notifications_tmp) + notifications_tmp.close() + + # Delete notifications one by one, we expect to see at least one notification + notification_metadata_list = notifications['notification_metadata_list'] + removed = 0 + for nm in notification_metadata_list: + seq_number = nm['notification_metadata']['seq_number'] + print("removing notification with seq_number %s:" % seq_number) + self.equipTemplate("test_rm_notif.script", SEQ_NUMBER = seq_number) + self.runPySimShell(cardname, "test_rm_notif.script") + removed = removed + 1 + self.assertTrue(removed >= 2, "we expected to remove at least two notifications, but we have removed none!") + + # List notifications again, require none to be present + self.runPySimShell(cardname, "test_list_notif.script") + self.assertEqualFiles("notifications.tmp") if __name__ == "__main__": unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38369?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I95eb3b9c02a69653797851197e882ea9316805fc Gerrit-Change-Number: 38369 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: osmith <osmith@sysmocom.de>