Merge into trunk : apt-1020751 : Code : Ibid

Status:

Merged

Approved by:

Stefano Rivera on 2012-07-31

Approved revision:

1047

Merged at revision:

1048

Proposed branch:

lp://staging/~stefanor/ibid/apt-1020751

Merge into:

lp://staging/ibid

Diff against target:

14 lines (+1/-3)

1 file modified

ibid/plugins/sysadmin.py (+1/-3)

To merge this branch:

bzr merge lp://staging/~stefanor/ibid/apt-1020751

Related bugs:

Bug #1020751: [sysadmin] apt-show broke

Low

Fix Committed

Link a bug report

Reviewer	Date Requested	Status
Keegan Carruthers-Smith		Approve on 2012-07-12
Max Rabkin	2012-07-03	Approve on 2012-07-06
Review via email: mp+113306@code.staging.launchpad.net

Commit message

Don't display long descriptions of APT packages. DDE no longer provides them.

Revision history for this message

Max Rabkin (max-rabkin) on 2012-07-06:

#

review: Approve

Revision history for this message

Ibid Branch Auto-Lander (ibid-tarmac) wrote on 2012-07-06:

#

Download full text (10.7 KiB)

The attempt to merge lp:~stefanor/ibid/apt-1020751 into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ... [OK]
    test_too_big ... [OK]
ibid.test.plugins.test_conversions
  CurrencyConversionTest
    test_conversion ... [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
  CurrencyLookupTest
    test_common_currencies ... [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_country ... [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_country_association ... [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_fallthrough ... [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_tld ... [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
  UnihanTest
    test_simp_trad ... [OK]
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:3: DeprecationWarning: BeautifulSoup 3.x (as of 3.1) is not fully compatible with html5lib and support will be removed in the future
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:141: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:163: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ... [OK]
    test_happy_suffix_names ... [OK]
    test_non_messages ... [OK]
    test_sad_prefix_names ... [OK]
    test_sad_suffix_names ... [OK]
    test_strip_punct ... [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ... [OK]
    test_append ... [OK]
    test_duplicate_names ... [OK]
    test_empty ... ...

The attempt to merge lp:~stefanor/ibid/apt-1020751 into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ...                                                         [OK]
    test_too_big ...                                                       [OK]
ibid.test.plugins.test_conversions
  CurrencyConversionTest
    test_conversion ...                                                  [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
  CurrencyLookupTest
    test_common_currencies ...                                             [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_country ...                                                       [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_country_association ...                                         [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_fallthrough ...                                                   [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_tld ...                                                         [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
  UnihanTest
    test_simp_trad ...                                                     [OK]
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:3: DeprecationWarning: BeautifulSoup 3.x (as of 3.1) is not fully compatible with html5lib and support will be removed in the future
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:141: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:163: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ...                                            [OK]
    test_happy_suffix_names ...                                            [OK]
    test_non_messages ...                                                  [OK]
    test_sad_prefix_names ...                                              [OK]
    test_sad_suffix_names ...                                              [OK]
    test_strip_punct ...                                                   [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ...                                                          [OK]
    test_append ...                                                        [OK]
    test_duplicate_names ...                                               [OK]
    test_empty ...                                                         [OK]
    test_forget_multiple ...                                               [OK]
    test_forget_wildcard ...                                               [OK]
    test_get_case ...                                                      [OK]
    test_modify_nothing ...                                                [OK]
    test_multiple_copula ...                                               [OK]
    test_name_punctuation ...                                              [OK]
    test_same_as_nothing ...                                               [OK]
    test_search_case ...                                                   [OK]
    test_search_unescape ...                                               [OK]
    test_string_replace ...                                                [OK]
    test_string_transliterate ...                                          [OK]
    test_unicode_name ...                                                  [OK]
    test_wildcard_tamecard ...                                             [OK]
ibid.test.plugins.test_google
  GDefineTest
    test_basic ...                                                         [OK]
    test_unicode_latin ...                                                 [OK]
ibid.test.plugins.test_url
  TestURLGrabber
    test_bad_grabs ...                                                     [OK]
    test_good_grabs ...                                                    [OK]
ibid.test.test_core
  TestDispatcher
    test_call_later_args ...                                               [OK]
    test_call_later_kwargs ...                                             [OK]
    test_call_later_multi_reply ...                                        [OK]
    test_call_later_no_args ...                                            [OK]
    test_call_later_reply ...                                              [OK]
    test_dispatch_broken_processor ...                                     [OK]
    test_dispatch_double_reply ...                                         [OK]
    test_dispatch_no_processors ...                                        [OK]
    test_dispatch_noop_processor ...                                       [OK]
    test_dispatch_reply_send_invalid_source ...                            [OK]
    test_dispatch_reply_send_valid_source ...                              [OK]
    test_dispatch_simple_reply ...                                         [OK]
    test_process_broken_processor ...                                      [OK]
    test_process_double_reply ...                                          [OK]
    test_process_no_processors ...                                         [OK]
    test_process_noop_processor ...                                        [OK]
    test_process_reply_send_invalid_source ...                             [OK]
    test_process_reply_send_valid_source ...                               [OK]
    test_process_simple_reply ...                                          [OK]
ibid.test.test_event
  TestEvent
    test_None_response ...                                                 [OK]
    test_attr ...                                                          [OK]
    test_complex_dict_response ...                                         [OK]
    test_complex_dict_with_kwargs_response ...                             [OK]
    test_empty_event ...                                                   [OK]
    test_simple_dict_response ...                                          [OK]
    test_str_kwargs_response ...                                           [OK]
    test_str_response ...                                                  [OK]
    test_str_response_processed_unprocessed ...                            [OK]
    test_str_response_twice ...                                            [OK]
    test_str_response_unprocessed ...                                      [OK]
    test_str_response_with_channel ...                                     [OK]
    test_unicode_params_response ...                                       [OK]
    test_unicode_response ...                                              [OK]
    test_unicode_tuple_params_response ...                                 [OK]
ibid.test.test_utils
  TestUtils
    test_ago ...                                                           [OK]
  TestUtilsNetwork
    test_get_country_codes ...                                           [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)

===============================================================================
[FAIL]: ibid.test.plugins.test_conversions.CurrencyConversionTest.test_conversion

Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 62, in test_conversion
    r'1 USD \(.+\) = [0-9.]+ AUD \(.+\) .* Bid: [0-9.]+')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/__init__.py", line 206, in assertResponseMatches
    self.fail("No response in matches regex %r" % regex, event)
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/__init__.py", line 187, in fail
    unittest.TestCase.fail(self, message)
twisted.trial.unittest.FailTest: No response in matches regex '1 USD \\(.+\\) = [0-9.]+ AUD \\(.+\\) .* Bid: [0-9.]+'
{'account': None, 'responses': [{'reply': u'1 USD (US Dollar) = 0.56 LVL (Latvian Lats) (Last trade rate: 0.5623, Bid: 0.5619, Ask: 0.5628)', 'address': True, 'target': u'testchan', 'conflate': True, 'source': u'test_source_154541644'}], 'channel': u'testchan', 'source': u'test_source_154541644', 'addressed': True, 'processed': True, 'time': datetime.datetime(2012, 7, 6, 12, 30, 46, 563848), 'message': {'raw': u'exchange 1 Virgin Islands for .tv', 'deaddressed': u'exchange 1 Virgin Islands for .tv', 'clean': u'exchange 1 Virgin Islands for .tv', 'stripped': u'exchange 1 Virgin Islands for .tv'}, 'type': u'message', 'public': False, 'identity': 1, 'sender': {'nick': u'user', 'connection': u'user', 'id': u'user'}}
===============================================================================
[FAIL]: ibid.test.plugins.test_conversions.CurrencyLookupTest.test_country_association

Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 27, in test_country_association
    self.assertTrue(self.processor._load_currencies())
twisted.trial.unittest.FailTest: None
===============================================================================
[FAIL]: ibid.test.plugins.test_conversions.CurrencyLookupTest.test_tld

Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 36, in test_tld
    self.assertEqual(self.processor.resolve_currency('.za', True), 'ZAR')
twisted.trial.unittest.FailTest: not equal:
a = 'TZS'
b = 'ZAR'

===============================================================================
[FAIL]: ibid.test.test_utils.TestUtilsNetwork.test_get_country_codes

Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/test_utils.py", line 19, in test_get_country_codes
    self.assertIn('ZA', codes)
twisted.trial.unittest.FailTest: 'ZA' not in {u'AC': u'Ascension Island', u'SU': u'Soviet Union', u'TP': u'East Timor', u'UK': u'United Kingdom', u'EU': u'European Union', u'YU': u'Yugoslavia'}
-------------------------------------------------------------------------------
Ran 72 tests in 26.732s

FAILED (failures=4, successes=68)

Couldn't load knab plugin for skeleton DB: No module named perl
Couldn't load memory plugin for skeleton DB: No module named objgraph

Revision history for this message

Keegan Carruthers-Smith (keegan-csmith) on 2012-07-12:

#

review: Approve

Ibid

Merge lp://staging/~stefanor/ibid/apt-1020751 into lp://staging/ibid

Commit message

Description of the change

Preview Diff

Subscribers