comparison test/db_test_base.py @ 5649:f8893e1cde0d

assert_ is depricated. Replacing with assertTrue to reduce logs in travisci.
author John Rouillard <rouilj@ieee.org>
date Fri, 15 Mar 2019 20:29:00 -0400
parents b7fa56ced601
children cd33bbf03cf3
comparison
equal deleted inserted replaced
5648:a4514df51ded 5649:f8893e1cde0d
672 self.assertEqual(set(self.db.status.getnodeids(retired=True)), 672 self.assertEqual(set(self.db.status.getnodeids(retired=True)),
673 set(['1'])) 673 set(['1']))
674 self.assertEqual(set(self.db.status.getnodeids(retired=False)), 674 self.assertEqual(set(self.db.status.getnodeids(retired=False)),
675 set(others)) 675 set(others))
676 676
677 self.assert_(self.db.status.is_retired('1')) 677 self.assertTrue(self.db.status.is_retired('1'))
678 678
679 # make sure the list is different 679 # make sure the list is different
680 self.assertNotEqual(a, self.db.status.list()) 680 self.assertNotEqual(a, self.db.status.list())
681 681
682 # can still access the node if necessary 682 # can still access the node if necessary
683 self.assertEqual(self.db.status.get('1', 'name'), b) 683 self.assertEqual(self.db.status.get('1', 'name'), b)
684 self.assertRaises(IndexError, self.db.status.set, '1', name='hello') 684 self.assertRaises(IndexError, self.db.status.set, '1', name='hello')
685 self.db.commit() 685 self.db.commit()
686 self.assert_(self.db.status.is_retired('1')) 686 self.assertTrue(self.db.status.is_retired('1'))
687 self.assertEqual(self.db.status.get('1', 'name'), b) 687 self.assertEqual(self.db.status.get('1', 'name'), b)
688 self.assertNotEqual(a, self.db.status.list()) 688 self.assertNotEqual(a, self.db.status.list())
689 689
690 # try to restore retired node 690 # try to restore retired node
691 self.db.status.restore('1') 691 self.db.status.restore('1')
692 692
693 self.assert_(not self.db.status.is_retired('1')) 693 self.assertTrue(not self.db.status.is_retired('1'))
694 694
695 def testCacheCreateSet(self): 695 def testCacheCreateSet(self):
696 self.db.issue.create(title="spam", status='1') 696 self.db.issue.create(title="spam", status='1')
697 a = self.db.issue.get('1', 'title') 697 a = self.db.issue.get('1', 'title')
698 self.assertEqual(a, 'spam') 698 self.assertEqual(a, 'spam')
1449 f1 = self.db.file.create(content='hello') 1449 f1 = self.db.file.create(content='hello')
1450 f2 = self.db.file.create(content='hello, world') 1450 f2 = self.db.file.create(content='hello, world')
1451 i1 = self.db.issue.create(files=[f1, f2]) 1451 i1 = self.db.issue.create(files=[f1, f2])
1452 self.db.commit() 1452 self.db.commit()
1453 d = self.db.indexer.search(['hello'], self.db.issue) 1453 d = self.db.indexer.search(['hello'], self.db.issue)
1454 self.assert_(i1 in d) 1454 self.assertTrue(i1 in d)
1455 d[i1]['files'].sort() 1455 d[i1]['files'].sort()
1456 self.assertEquals(d, {i1: {'files': [f1, f2]}}) 1456 self.assertEquals(d, {i1: {'files': [f1, f2]}})
1457 self.assertEquals(self.db.indexer.search(['world'], self.db.issue), 1457 self.assertEquals(self.db.indexer.search(['world'], self.db.issue),
1458 {i1: {'files': [f2]}}) 1458 {i1: {'files': [f2]}})
1459 self.db.file.set(f1, content="world") 1459 self.db.file.set(f1, content="world")
2588 messages = [m], nosy = [db.user.lookup("fred")]) 2588 messages = [m], nosy = [db.user.lookup("fred")])
2589 2589
2590 db.issue.nosymessage(i, m, {}) 2590 db.issue.nosymessage(i, m, {})
2591 mail_msg = str(res["mail_msg"]) 2591 mail_msg = str(res["mail_msg"])
2592 self.assertEqual(res["mail_to"], ["fred@example.com"]) 2592 self.assertEqual(res["mail_to"], ["fred@example.com"])
2593 self.assert_("From: admin" in mail_msg) 2593 self.assertTrue("From: admin" in mail_msg)
2594 self.assert_("Subject: [issue1] spam" in mail_msg) 2594 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2595 self.assert_("New submission from admin" in mail_msg) 2595 self.assertTrue("New submission from admin" in mail_msg)
2596 self.assert_("one two" in mail_msg) 2596 self.assertTrue("one two" in mail_msg)
2597 self.assert_("File 'test1.txt' not attached" not in mail_msg) 2597 self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2598 self.assert_(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg) 2598 self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2599 self.assert_("File 'test2.txt' not attached" in mail_msg) 2599 self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2600 self.assert_(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg) 2600 self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
2601 finally : 2601 finally :
2602 roundupdb._ = old_translate_ 2602 roundupdb._ = old_translate_
2603 Mailer.smtp_send = backup 2603 Mailer.smtp_send = backup
2604 2604
2605 def testNosyMailTextAndBinary(self) : 2605 def testNosyMailTextAndBinary(self) :
2621 messages = [m], nosy = [db.user.lookup("fred")]) 2621 messages = [m], nosy = [db.user.lookup("fred")])
2622 2622
2623 db.issue.nosymessage(i, m, {}) 2623 db.issue.nosymessage(i, m, {})
2624 mail_msg = str(res["mail_msg"]) 2624 mail_msg = str(res["mail_msg"])
2625 self.assertEqual(res["mail_to"], ["fred@example.com"]) 2625 self.assertEqual(res["mail_to"], ["fred@example.com"])
2626 self.assert_("From: admin" in mail_msg) 2626 self.assertTrue("From: admin" in mail_msg)
2627 self.assert_("Subject: [issue1] spam" in mail_msg) 2627 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2628 self.assert_("New submission from admin" in mail_msg) 2628 self.assertTrue("New submission from admin" in mail_msg)
2629 self.assert_("one two" in mail_msg) 2629 self.assertTrue("one two" in mail_msg)
2630 self.assert_("Hello world" in mail_msg) 2630 self.assertTrue("Hello world" in mail_msg)
2631 self.assert_(b2s(base64.encodestring(b"\x01\x02\x03\xfe\xff")).rstrip() in mail_msg) 2631 self.assertTrue(b2s(base64.encodestring(b"\x01\x02\x03\xfe\xff")).rstrip() in mail_msg)
2632 finally : 2632 finally :
2633 roundupdb._ = old_translate_ 2633 roundupdb._ = old_translate_
2634 Mailer.smtp_send = backup 2634 Mailer.smtp_send = backup
2635 2635
2636 @pytest.mark.skipif(gpgmelib.gpg is None, reason='Skipping PGPNosy test') 2636 @pytest.mark.skipif(gpgmelib.gpg is None, reason='Skipping PGPNosy test')
2665 db.issue.nosymessage(i, m, {}) 2665 db.issue.nosymessage(i, m, {})
2666 res.sort(key=lambda x: x['mail_to']) 2666 res.sort(key=lambda x: x['mail_to'])
2667 self.assertEqual(res[0]["mail_to"], ["fred@example.com"]) 2667 self.assertEqual(res[0]["mail_to"], ["fred@example.com"])
2668 self.assertEqual(res[1]["mail_to"], ["john@test.test"]) 2668 self.assertEqual(res[1]["mail_to"], ["john@test.test"])
2669 mail_msg = str(res[0]["mail_msg"]) 2669 mail_msg = str(res[0]["mail_msg"])
2670 self.assert_("From: admin" in mail_msg) 2670 self.assertTrue("From: admin" in mail_msg)
2671 self.assert_("Subject: [issue1] spam" in mail_msg) 2671 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2672 self.assert_("New submission from admin" in mail_msg) 2672 self.assertTrue("New submission from admin" in mail_msg)
2673 self.assert_("one two" in mail_msg) 2673 self.assertTrue("one two" in mail_msg)
2674 self.assert_("File 'test1.txt' not attached" not in mail_msg) 2674 self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2675 self.assert_(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg) 2675 self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2676 self.assert_("File 'test2.txt' not attached" in mail_msg) 2676 self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2677 self.assert_(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg) 2677 self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
2678 mail_msg = str(res[1]["mail_msg"]) 2678 mail_msg = str(res[1]["mail_msg"])
2679 parts = message_from_string(mail_msg).get_payload() 2679 parts = message_from_string(mail_msg).get_payload()
2680 self.assertEqual(len(parts),2) 2680 self.assertEqual(len(parts),2)
2681 self.assertEqual(parts[0].get_payload().strip(), 'Version: 1') 2681 self.assertEqual(parts[0].get_payload().strip(), 'Version: 1')
2682 crypt = gpgmelib.gpg.core.Data(parts[1].get_payload()) 2682 crypt = gpgmelib.gpg.core.Data(parts[1].get_payload())
2683 plain = gpgmelib.gpg.core.Data() 2683 plain = gpgmelib.gpg.core.Data()
2684 ctx = gpgmelib.gpg.core.Context() 2684 ctx = gpgmelib.gpg.core.Context()
2685 res = ctx.op_decrypt(crypt, plain) 2685 res = ctx.op_decrypt(crypt, plain)
2686 self.assertEqual(res, None) 2686 self.assertEqual(res, None)
2687 plain.seek(0,0) 2687 plain.seek(0,0)
2688 self.assert_("From: admin" in mail_msg) 2688 self.assertTrue("From: admin" in mail_msg)
2689 self.assert_("Subject: [issue1] spam" in mail_msg) 2689 self.assertTrue("Subject: [issue1] spam" in mail_msg)
2690 mail_msg = str(message_from_bytes(plain.read())) 2690 mail_msg = str(message_from_bytes(plain.read()))
2691 self.assert_("New submission from admin" in mail_msg) 2691 self.assertTrue("New submission from admin" in mail_msg)
2692 self.assert_("one two" in mail_msg) 2692 self.assertTrue("one two" in mail_msg)
2693 self.assert_("File 'test1.txt' not attached" not in mail_msg) 2693 self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2694 self.assert_(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg) 2694 self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2695 self.assert_("File 'test2.txt' not attached" in mail_msg) 2695 self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2696 self.assert_(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg) 2696 self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
2697 finally : 2697 finally :
2698 roundupdb._ = old_translate_ 2698 roundupdb._ = old_translate_
2699 Mailer.smtp_send = backup 2699 Mailer.smtp_send = backup
2700 gpgmelib.tearDownPGP() 2700 gpgmelib.tearDownPGP()
2701 2701
2748 2748
2749 def test_fileClassProps(self): 2749 def test_fileClassProps(self):
2750 self.open_database() 2750 self.open_database()
2751 a = self.module.FileClass(self.db, 'a') 2751 a = self.module.FileClass(self.db, 'a')
2752 l = sorted(a.getprops().keys()) 2752 l = sorted(a.getprops().keys())
2753 self.assert_(l, ['activity', 'actor', 'content', 'created', 2753 self.assertTrue(l, ['activity', 'actor', 'content', 'created',
2754 'creation', 'type']) 2754 'creation', 'type'])
2755 2755
2756 def init_ab(self): 2756 def init_ab(self):
2757 self.open_database() 2757 self.open_database()
2758 a = self.module.Class(self.db, "a", name=String()) 2758 a = self.module.Class(self.db, "a", name=String())
2814 self.assertEqual(self.db.a.get(aid, 'name'), 'apple') 2814 self.assertEqual(self.db.a.get(aid, 'name'), 'apple')
2815 self.assertEqual(self.db.a.get(aid, 'newstr'), None) 2815 self.assertEqual(self.db.a.get(aid, 'newstr'), None)
2816 self.assertEqual(self.db.a.get(aid, 'newint'), None) 2816 self.assertEqual(self.db.a.get(aid, 'newint'), None)
2817 # hack - metakit can't return None for missing values, and we're not 2817 # hack - metakit can't return None for missing values, and we're not
2818 # really checking for that behavior here anyway 2818 # really checking for that behavior here anyway
2819 self.assert_(not self.db.a.get(aid, 'newnum')) 2819 self.assertTrue(not self.db.a.get(aid, 'newnum'))
2820 self.assert_(not self.db.a.get(aid, 'newbool')) 2820 self.assertTrue(not self.db.a.get(aid, 'newbool'))
2821 self.assertEqual(self.db.a.get(aid, 'newdate'), None) 2821 self.assertEqual(self.db.a.get(aid, 'newdate'), None)
2822 self.assertEqual(self.db.b.get(aid, 'name'), 'bear') 2822 self.assertEqual(self.db.b.get(aid, 'name'), 'bear')
2823 aid2 = self.db.a.create(name='aardvark', newstr='booz') 2823 aid2 = self.db.a.create(name='aardvark', newstr='booz')
2824 self.db.commit(); self.db.close() 2824 self.db.commit(); self.db.close()
2825 2825

Roundup Issue Tracker: http://roundup-tracker.org/