Merge cf96bb1 into 1470009

integration_tests/test_snap.py

@@ -130,7 +130,7 @@ def test_error_with_unexistent_build_package(self):
             subprocess.CalledProcessError, self.run_snapcraft, 'snap')
         expected = (
             "Could not find a required package in 'build-packages': "
-            '"The cache has\nno package named \'inexistent-package\'"\n')
+            '"The cache has no package named \'inexistent-package\'"\n')
         self.assertEqual(expected, exception.output)
 
     def test_snap_with_exposed_files(self):

integration_tests/test_stage.py

@@ -32,5 +32,5 @@ def test_conflicts(self):
         self.assertEqual(1, exception.returncode)
         expected = (
             "Parts 'p1' and 'p2' have the following file paths in common "
-            "which have\ndifferent contents: bin/test\n")
+            "which have different contents:\nbin/test\n")
         self.assertThat(exception.output, EndsWith(expected))

snapcraft/main.py

@@ -114,7 +114,6 @@
 import pkgutil
 import shutil
 import sys
-import textwrap
 
 from docopt import docopt
 
@@ -205,7 +204,7 @@ def main(argv=None):
         if args['--debug']:
             raise
 
-        logger.error(textwrap.fill(str(e)))
+        logger.error(str(e))
         sys.exit(1)
 
 

snapcraft/tests/test_commands_cleanbuild.py

@@ -110,7 +110,7 @@ def test_no_lxd(self, mock_installed):
         self.assertEqual(
             fake_logger.output,
             'The lxd package is not installed, in order to use `cleanbuild` '
-            'you\nmust install lxd onto your system. Refer to the '
-            '"Ubuntu Desktop and\nUbuntu Server" section on '
-            'https://linuxcontainers.org/lxd/getting-\nstarted-cli/'
-            '#ubuntu-desktop-and-ubuntu-server to enable a proper\nsetup.\n')
+            'you must install lxd onto your system. Refer to the '
+            '"Ubuntu Desktop and Ubuntu Server" section on '
+            'https://linuxcontainers.org/lxd/getting-started-cli/'
+            '#ubuntu-desktop-and-ubuntu-server to enable a proper setup.\n')

snapcraft/tests/test_commands_help.py

@@ -48,7 +48,7 @@ def test_topic_and_plugin_not_found_exits_with_tip(self):
         self.assertEqual(
             fake_logger.output,
             'The plugin does not exist. Run `snapcraft '
-            'list-plugins` to see the\navailable plugins.\n')
+            'list-plugins` to see the available plugins.\n')
 
     @mock.patch('sys.stdout', new_callable=io.StringIO)
     def test_print_module_help_when_no_help_for_valid_plugin(