Merge lp:~rvb/maas-test/fix-error-reporting into lp:maas-test

[Raphaël Badin]

Use text_content instead of binary_content with addDetail.

[Gavin Panella (allenap)]

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~rvb/maas-test/fix-error-reporting into lp:maas-test failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Get:1 http://security.ubuntu.com saucy-security Release.gpg [933 B]
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Get:2 http://security.ubuntu.com saucy-security Release [49.6 kB]
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Get:5 http://security.ubuntu.com saucy-security/main Sources [15.6 kB]
Get:6 http://security.ubuntu.com saucy-security/universe Sources [6,663 B]
Get:7 http://security.ubuntu.com saucy-security/main amd64 Packages [46.0 kB]
Get:8 http://security.ubuntu.com saucy-security/universe amd64 Packages [18.1 kB]
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Get:9 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [51.8 kB]
Get:10 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [19.1 kB]
Get:11 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [151 kB]
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:12 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [59.7 kB]
Get:13 http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en [67.8 kB]
Get:14 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en [33.9 kB]
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 571 kB in 0s (2,439 kB/s)
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
cpu-checker is already the newest version.
python-distro-info is already the newest version.
python-fixtures is already the newest version.
python-lxml is already the newest version.
python-mock is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-six is already the newest version.
python-testresources is already the newest version.
python-testtools is already the newest version.
python-xdg is already the newest version.
python3-fixtur...

[lp:~rvb/maas-test/fix-error-reporting]

95. By Raphaël Badin on 2013-12-12

Fix tests.

=== modified file 'maastest/kvmfixture.py'
--- maastest/kvmfixture.py	2013-12-10 14:09:16 +0000
+++ maastest/kvmfixture.py	2013-12-12 16:46:49 +0000
@@ -26,7 +26,6 @@
 from fixtures import Fixture
 from lxml import etree
 from maastest.utils import (
-    binary_content,
     extract_mac_ip_mapping,
     retries,
     run_command,
@@ -372,8 +371,10 @@
         self.addDetail(cmd_prefix + ' retcode', text_content(str(retcode)))
         input_detail = '' if input is None else input
         self.addDetail(cmd_prefix + ' input', text_content(input_detail))
-        self.addDetail(cmd_prefix + ' stdout', binary_content(stdout))
-        self.addDetail(cmd_prefix + ' stderr', binary_content(stderr))
+        u_stdout = unicode(stdout, errors='replace')
+        self.addDetail(cmd_prefix + ' stdout', text_content(u_stdout))
+        u_stderr = unicode(stderr, errors='replace')
+        self.addDetail(cmd_prefix + ' stderr', text_content(u_stderr))
         return retcode, stdout, stderr
 
     def get_ip_from_network_scan(self, mac_address):

=== modified file 'maastest/tests/test_kvmfixture.py'
--- maastest/tests/test_kvmfixture.py	2013-12-10 14:09:42 +0000
+++ maastest/tests/test_kvmfixture.py	2013-12-12 16:46:49 +0000
@@ -20,10 +20,7 @@
 import fixtures
 from lxml import etree
 from maastest import kvmfixture
-from maastest.utils import (
-    binary_content,
-    read_file,
-    )
+from maastest.utils import read_file
 import mock
 import netaddr
 from six import text_type
@@ -590,14 +587,14 @@
             (
                 text_type(return_value),
                 input,
-                binary_content(stdout_content),
-                binary_content(stderr_content),
+                stdout_content,
+                stderr_content,
             ),
             (
                 details['cmd #0001 retcode'].as_text(),
                 details['cmd #0001 input'].as_text(),
-                details['cmd #0001 stdout'],
-                details['cmd #0001 stderr'],
+                details['cmd #0001 stdout'].as_text(),
+                details['cmd #0001 stderr'].as_text(),
             ))
 
     def test_get_ip_from_network_scan(self):