← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/archiveuploader/tests/test_uploadprocessor.py

[r=allenap][bug=905853, 905855,
        906079] Revert r14499 and r14459 because read-only transactions in
        buildmaster are causing production issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/archiveuploader/tests/test_uploadprocessor.py
629
629
        from_addr, to_addrs, raw_msg = stub.test_emails.pop()
630
630
        foo_bar = "Foo Bar <foo.bar@canonical.com>"
631
631
        daniel = "Daniel Silverstone <daniel.silverstone@canonical.com>"
632
 
        self.assertContentEqual(
633
 
            [foo_bar, daniel], [e.strip() for e in to_addrs])
 
632
        self.assertEqual([e.strip() for e in to_addrs], [foo_bar, daniel])
634
633
        self.assertTrue(
635
634
            "NEW" in raw_msg, "Expected email containing 'NEW', got:\n%s"
636
635
            % raw_msg)
664
663
        from_addr, to_addrs, raw_msg = stub.test_emails.pop()
665
664
        daniel = "Daniel Silverstone <daniel.silverstone@canonical.com>"
666
665
        foo_bar = "Foo Bar <foo.bar@canonical.com>"
667
 
        self.assertContentEqual(
668
 
            [foo_bar, daniel], [e.strip() for e in to_addrs])
 
666
        self.assertEqual([e.strip() for e in to_addrs], [foo_bar, daniel])
669
667
        self.assertTrue("Waiting for approval" in raw_msg,
670
668
                        "Expected an 'upload awaits approval' email.\n"
671
669
                        "Got:\n%s" % raw_msg)