← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~wallyworld/launchpad/remove-tests-for-badrev-13696 into lp:launchpad

 

Ian Booth has proposed merging lp:~wallyworld/launchpad/remove-tests-for-badrev-13696 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wallyworld/launchpad/remove-tests-for-badrev-13696/+merge/71642

A previous rollback didn't remove tests which were part of the rollback.
This branch fixes that.


-- 
https://code.launchpad.net/~wallyworld/launchpad/remove-tests-for-badrev-13696/+merge/71642
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wallyworld/launchpad/remove-tests-for-badrev-13696 into lp:launchpad.
=== modified file 'lib/lp/answers/browser/tests/test_questiontarget.py'
--- lib/lp/answers/browser/tests/test_questiontarget.py	2011-08-15 03:42:02 +0000
+++ lib/lp/answers/browser/tests/test_questiontarget.py	2011-08-16 06:01:08 +0000
@@ -373,32 +373,6 @@
             self.assertEqual(
                 dumps([expected_result]), view.answercontact_data_js)
 
-    def test_data_target_owner_answercontact_looks(self):
-        # Answercontact_data_js has can_edit set to true for target owner.
-        distro = self.factory.makeDistribution()
-        question = self.factory.makeQuestion(target=distro)
-        contact = self.factory.makePerson(
-            name='user', displayname='Contact Name')
-        contact.addLanguage(getUtility(ILanguageSet)['en'])
-        with person_logged_in(contact):
-            question.target.addAnswerContact(contact, contact)
-        view = create_view(question.target, '+portlet-answercontacts-details')
-        api_request = IWebServiceClientRequest(view.request)
-
-        expected_result = {
-            'subscriber': {
-                'name': 'user',
-                'display_name': 'Contact Name',
-                'is_team': False,
-                'can_edit': True,
-                'web_link': canonical_url(contact),
-                'self_link': absoluteURL(contact, api_request)
-                }
-            }
-        with person_logged_in(distro.owner):
-            self.assertEqual(
-                dumps([expected_result]), view.answercontact_data_js)
-
     def test_data_subscription_lp_admin(self):
         # For a subscription, answercontact_data_js has can_edit
         # set to true for a Launchpad admin.

=== modified file 'lib/lp/answers/tests/test_questiontarget.py'
--- lib/lp/answers/tests/test_questiontarget.py	2011-08-12 04:17:29 +0000
+++ lib/lp/answers/tests/test_questiontarget.py	2011-08-16 06:01:08 +0000
@@ -36,12 +36,6 @@
         self.assertTrue(
             self.project.canUserAlterAnswerContact(self.user, self.user))
 
-    def test_canUserAlterAnswerContact_owner(self):
-        login_person(self.user)
-        self.assertTrue(
-            self.project.canUserAlterAnswerContact(
-                self.user, self.project.owner))
-
     def test_canUserAlterAnswerContact_other_user(self):
         login_person(self.user)
         other_user = self.factory.makePerson()