test_autopkgtest: Make the version 'blacklisted', to be clearer

tests/test_autopkgtest.py

@@ -976,28 +976,27 @@ class T(TestBase):
                                          'newgreen': ['amd64', 'i386']}})
 
     def test_blacklisted_fail(self):
-        '''blacklisted packages return exit code 99 and version all, check they
-        are handled correctly'''
+        '''blacklisted packages return exit code 99 and version blacklisted,
+        check they are handled correctly'''
 
         self.data.add('brown', False, {'Depends': 'grey'}, testsuite='autopkgtest')
 
         self.swift.set_results({'autopkgtest-series': {
             'series/amd64/b/black/20150101_100000@': (0, 'black 1', tr('black/1')),
-            'series/amd64/b/black/20150102_100000@': (99, 'black all', tr('black/2')),
-            'series/amd64/g/grey/20150101_100000@': (99, 'grey all', tr('grey/1')),
-            'series/amd64/b/brown/20150101_100000@': (99, 'brown all', tr('grey/2')),
+            'series/amd64/b/black/20150102_100000@': (99, 'black blacklisted', tr('black/2')),
+            'series/amd64/g/grey/20150101_100000@': (99, 'grey blacklisted', tr('grey/1')),
+            'series/amd64/b/brown/20150101_100000@': (99, 'brown blacklisted', tr('grey/2')),
         }})
 
         self.do_test(
             [('black', {'Version': '2'}, 'autopkgtest'),
              ('grey', {'Version': '2'}, 'autopkgtest')],
-            {'black': (False, {'black/all': {'amd64': 'REGRESSION'},
+            {'black': (False, {'black/blacklisted': {'amd64': 'REGRESSION'},
                                'black': {'i386': 'RUNNING-ALWAYSFAIL'}}),
              'grey': (True, {'grey': {'amd64': 'RUNNING-ALWAYSFAIL'},
-                             'brown/all': {'amd64': 'ALWAYSFAIL'},
+                             'brown/blacklisted': {'amd64': 'ALWAYSFAIL'},
                              'brown': {'i386': 'RUNNING-ALWAYSFAIL'}})
-            },
-            {})
+            })
 
         self.assertEqual(len(self.amqp_requests), 4)
         self.assertEqual(self.pending_requests,