Mercurial > p > roundup > code

comparison test/db_test_base.py @ 5790:046717e09beb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
base64.encodestring is deprecated on python > 3.1. Eliminate warning using encodebytes on py 3.
author John Rouillard <rouilj@ieee.org>
date Mon, 10 Jun 2019 20:53:32 -0400
parents 28141c7dfc19
children ee2e8f8d6648
comparison
equal deleted inserted replaced
5789:8ef8aa3d485c 5790:046717e09beb
14 # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" 14 # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
15 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, 15 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
16 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. 16 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
17 17
18 from __future__ import print_function 18 from __future__ import print_function
19 import unittest, os, shutil, errno, imp, sys, time, pprint, base64, os.path 19 import unittest, os, shutil, errno, imp, sys, time, pprint, os.path
20
21 try:
22 from base64 import encodebytes as base64_encode # python3 only
23 except ImportError:
24 # python2 and deplricated in 3
25 from base64 import encodestring as base64_encode
26
20 import logging, cgi 27 import logging, cgi
21 from . import gpgmelib 28 from . import gpgmelib
22 from email import message_from_string 29 from email import message_from_string
23 30
24 import pytest 31 import pytest
2622 self.assertTrue("From: admin" in mail_msg) 2629 self.assertTrue("From: admin" in mail_msg)
2623 self.assertTrue("Subject: [issue1] spam" in mail_msg) 2630 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2624 self.assertTrue("New submission from admin" in mail_msg) 2631 self.assertTrue("New submission from admin" in mail_msg)
2625 self.assertTrue("one two" in mail_msg) 2632 self.assertTrue("one two" in mail_msg)
2626 self.assertTrue("File 'test1.txt' not attached" not in mail_msg) 2633 self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2627 self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg) 2634 self.assertTrue(b2s(base64_encode(s2b("xxx"))).rstrip() in mail_msg)
2628 self.assertTrue("File 'test2.txt' not attached" in mail_msg) 2635 self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2629 self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg) 2636 self.assertTrue(b2s(base64_encode(s2b("yyy"))).rstrip() not in mail_msg)
2630 finally : 2637 finally :
2631 roundupdb._ = old_translate_ 2638 roundupdb._ = old_translate_
2632 Mailer.smtp_send = backup 2639 Mailer.smtp_send = backup
2633 2640
2634 def testNosyMailTextAndBinary(self) : 2641 def testNosyMailTextAndBinary(self) :
2655 self.assertTrue("From: admin" in mail_msg) 2662 self.assertTrue("From: admin" in mail_msg)
2656 self.assertTrue("Subject: [issue1] spam" in mail_msg) 2663 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2657 self.assertTrue("New submission from admin" in mail_msg) 2664 self.assertTrue("New submission from admin" in mail_msg)
2658 self.assertTrue("one two" in mail_msg) 2665 self.assertTrue("one two" in mail_msg)
2659 self.assertTrue("Hello world" in mail_msg) 2666 self.assertTrue("Hello world" in mail_msg)
2660 self.assertTrue(b2s(base64.encodestring(b"\x01\x02\x03\xfe\xff")).rstrip() in mail_msg) 2667 self.assertTrue(b2s(base64_encode(b"\x01\x02\x03\xfe\xff")).rstrip() in mail_msg)
2661 finally : 2668 finally :
2662 roundupdb._ = old_translate_ 2669 roundupdb._ = old_translate_
2663 Mailer.smtp_send = backup 2670 Mailer.smtp_send = backup
2664 2671
2665 @pytest.mark.skipif(gpgmelib.gpg is None, reason='Skipping PGPNosy test') 2672 @pytest.mark.skipif(gpgmelib.gpg is None, reason='Skipping PGPNosy test')
2699 self.assertTrue("From: admin" in mail_msg) 2706 self.assertTrue("From: admin" in mail_msg)
2700 self.assertTrue("Subject: [issue1] spam" in mail_msg) 2707 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2701 self.assertTrue("New submission from admin" in mail_msg) 2708 self.assertTrue("New submission from admin" in mail_msg)
2702 self.assertTrue("one two" in mail_msg) 2709 self.assertTrue("one two" in mail_msg)
2703 self.assertTrue("File 'test1.txt' not attached" not in mail_msg) 2710 self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2704 self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg) 2711 self.assertTrue(b2s(base64_encode(s2b("xxx"))).rstrip() in mail_msg)
2705 self.assertTrue("File 'test2.txt' not attached" in mail_msg) 2712 self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2706 self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg) 2713 self.assertTrue(b2s(base64_encode(s2b("yyy"))).rstrip() not in mail_msg)
2707 mail_msg = str(res[1]["mail_msg"]) 2714 mail_msg = str(res[1]["mail_msg"])
2708 parts = message_from_string(mail_msg).get_payload() 2715 parts = message_from_string(mail_msg).get_payload()
2709 self.assertEqual(len(parts),2) 2716 self.assertEqual(len(parts),2)
2710 self.assertEqual(parts[0].get_payload().strip(), 'Version: 1') 2717 self.assertEqual(parts[0].get_payload().strip(), 'Version: 1')
2711 crypt = gpgmelib.gpg.core.Data(parts[1].get_payload()) 2718 crypt = gpgmelib.gpg.core.Data(parts[1].get_payload())
2718 self.assertTrue("Subject: [issue1] spam" in mail_msg) 2725 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2719 mail_msg = str(message_from_bytes(plain.read())) 2726 mail_msg = str(message_from_bytes(plain.read()))
2720 self.assertTrue("New submission from admin" in mail_msg) 2727 self.assertTrue("New submission from admin" in mail_msg)
2721 self.assertTrue("one two" in mail_msg) 2728 self.assertTrue("one two" in mail_msg)
2722 self.assertTrue("File 'test1.txt' not attached" not in mail_msg) 2729 self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2723 self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg) 2730 self.assertTrue(b2s(base64_encode(s2b("xxx"))).rstrip() in mail_msg)
2724 self.assertTrue("File 'test2.txt' not attached" in mail_msg) 2731 self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2725 self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg) 2732 self.assertTrue(b2s(base64_encode(s2b("yyy"))).rstrip() not in mail_msg)
2726 finally : 2733 finally :
2727 roundupdb._ = old_translate_ 2734 roundupdb._ = old_translate_
2728 Mailer.smtp_send = backup 2735 Mailer.smtp_send = backup
2729 gpgmelib.tearDownPGP() 2736 gpgmelib.tearDownPGP()
2730 2737
Roundup Issue Tracker: http://roundup-tracker.org/