launchpad-reviewers team mailing list archive

[Guruprasad <mp+411788@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/lib/lp/buildmaster/interfaces/builder.py b/lib/lp/buildmaster/interfaces/builder.py
> index acd1dfd..a43fb7e 100644
> --- a/lib/lp/buildmaster/interfaces/builder.py
> +++ b/lib/lp/buildmaster/interfaces/builder.py
> @@ -101,7 +101,7 @@ class IBuilderModerateAttributes(Interface):
>      manual = exported(Bool(
>          title=_('Manual Mode'), required=False, default=False,
>          description=_('The auto-build system does not dispatch '
> -                      'jobs automatically for slaves in manual mode.')))
> +                      'jobs automatically for worker in manual mode.')))

@jugmac00, 'workers' to match 'slaves'?

>  
>      builderok = exported(Bool(
>          title=_('Builder State OK'), required=True, default=True,
> diff --git a/lib/lp/registry/javascript/distroseriesdifferences_details.js b/lib/lp/registry/javascript/distroseriesdifferences_details.js
> index 2f4066c..f007fec 100644
> --- a/lib/lp/registry/javascript/distroseriesdifferences_details.js
> +++ b/lib/lp/registry/javascript/distroseriesdifferences_details.js
> @@ -345,11 +345,11 @@ Y.extend(BlacklistWidget, Y.Widget, {
>      ANIM_DURATION: 1,
>  
>      /**
> -     * Submit the blacklist or unblacklist action. Updates the comment
> +     * Submit the blocklist or unblocklist action. Updates the comment
>       * list if successful.
>       *
>       * @param method_name {String}
> -     *     'blacklist' or 'unblacklist'.
> +     *     'blocklist' or 'unblocklist'.
>       * @param blacklist_all {Boolean}
>       *     Is this a blacklist all versions or blacklist current (only
>       *     relevant if method_name is 'blacklist').

@jugmac00, the above lines have to be fixed.

> @@ -376,7 +376,7 @@ Y.extend(BlacklistWidget, Y.Widget, {
>                              from: { backgroundColor: '#FFFFFF'},
>                              to: { backgroundColor: '#EEEEEE'},
>                              duration: self.ANIM_DURATION,
> -                            reverse: (method_name === 'unblacklist')
> +                            reverse: (method_name === 'unblocklist')
>                          });
>                          fade_to_gray.on('end', function() {
>                              self.fire('blacklisting_animation_ended');

@jugmac00, this needs to be modified as well, but since this appears to be an event name, I am not sure if it is a straightforward change. There are similar issues in the JavaScript changes below.

> diff --git a/lib/lp/registry/tests/test_distroseriesdifference.py b/lib/lp/registry/tests/test_distroseriesdifference.py
> index 9ab7cae..0163383 100644
> --- a/lib/lp/registry/tests/test_distroseriesdifference.py
> +++ b/lib/lp/registry/tests/test_distroseriesdifference.py
> @@ -448,57 +448,57 @@ class DistroSeriesDifferenceTestCase(TestCaseWithFactory):
>              sorted([packageset.name for packageset in packagesets]),
>              [packageset.name for packageset in ds_diff.packagesets])
>  
> -    def test_blacklist_unauthorised(self):
> +    def test_blocklist_unauthorised(self):
>          # If you're not an archive admin, you don't get to blacklist or
> -        # unblacklist.
> +        # unblocklist.
>          ds_diff = self.factory.makeDistroSeriesDifference()
>          random_joe = self.factory.makePerson()
>          with person_logged_in(random_joe):
> -            self.assertRaises(Unauthorized, getattr, ds_diff, 'blacklist')
> -            self.assertRaises(Unauthorized, getattr, ds_diff, 'unblacklist')
> +            self.assertRaises(Unauthorized, getattr, ds_diff, 'blocklist')
> +            self.assertRaises(Unauthorized, getattr, ds_diff, 'unblocklist')
>  
> -    def test_blacklist_default(self):
> -        # By default the current version is blacklisted.
> +    def test_blocklist_default(self):
> +        # By default the current version is blocklisted.
>          ds_diff = self.factory.makeDistroSeriesDifference()
>          admin = self.factory.makeArchiveAdmin(
>              ds_diff.derived_series.main_archive)
>  
>          with person_logged_in(admin):
> -            ds_diff.blacklist(admin)
> +            ds_diff.blocklist(admin)
>  
>          self.assertEqual(
>              DistroSeriesDifferenceStatus.BLACKLISTED_CURRENT,
>              ds_diff.status)
>  
> -    def test_blacklist_all(self):
> -        # All versions are blacklisted with the all=True param.
> +    def test_blocklist_all(self):
> +        # All versions are blocklisted with the all=True param.
>          ds_diff = self.factory.makeDistroSeriesDifference()
>          admin = self.factory.makeArchiveAdmin(
>              ds_diff.derived_series.main_archive)
>  
>          with person_logged_in(admin):
> -            ds_diff.blacklist(admin, all=True)
> +            ds_diff.blocklist(admin, all=True)
>  
>          self.assertEqual(
>              DistroSeriesDifferenceStatus.BLACKLISTED_ALWAYS,
>              ds_diff.status)
>  
> -    def test_unblacklist(self):
> -        # Unblacklisting will return to NEEDS_ATTENTION by default.
> +    def test_unblocklist(self):
> +        # Unblocklisting will return to NEEDS_ATTENTION by default.
>          ds_diff = self.factory.makeDistroSeriesDifference(
>              status=DistroSeriesDifferenceStatus.BLACKLISTED_CURRENT)

Python code which may not be easy/possible to change.

>          admin = self.factory.makeArchiveAdmin(
>              ds_diff.derived_series.main_archive)
>  
>          with person_logged_in(admin):
> -            ds_diff.unblacklist(admin)
> +            ds_diff.unblocklist(admin)
>  
>          self.assertEqual(
>              DistroSeriesDifferenceStatus.NEEDS_ATTENTION,
>              ds_diff.status)
>  
> -    def test_unblacklist_resolved(self):
> -        # Status is resolved when unblacklisting a now-resolved difference.
> +    def test_unblocklist_resolved(self):
> +        # Status is resolved when unblocklisting a now-resolved difference.
>          ds_diff = self.factory.makeDistroSeriesDifference(
>              versions={
>                  'derived': '0.9',


-- 
https://code.launchpad.net/~jugmac00/launchpad/+git/launchpad/+merge/411788
Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/launchpad:update-wadl-for-inclusive-naming into launchpad:master.