1
=== modified file 'maastest/kvmfixture.py'
2
--- maastest/kvmfixture.py	2013-12-10 14:09:16 +0000
3
+++ maastest/kvmfixture.py	2013-12-12 16:46:49 +0000
4
@@ -26,7 +26,6 @@
5
26
from fixtures import Fixture
26
from fixtures import Fixture
6
27
from lxml import etree
27
from lxml import etree
7
28
from maastest.utils import (
28
from maastest.utils import (
8
29
    binary_content,
9
30
    extract_mac_ip_mapping,
29
    extract_mac_ip_mapping,
10
31
    retries,
30
    retries,
11
32
    run_command,
31
    run_command,
12
@@ -372,8 +371,10 @@
13
372
        self.addDetail(cmd_prefix + ' retcode', text_content(str(retcode)))
371
        self.addDetail(cmd_prefix + ' retcode', text_content(str(retcode)))
14
373
        input_detail = '' if input is None else input
372
        input_detail = '' if input is None else input
15
374
        self.addDetail(cmd_prefix + ' input', text_content(input_detail))
373
        self.addDetail(cmd_prefix + ' input', text_content(input_detail))
18
375
        self.addDetail(cmd_prefix + ' stdout', binary_content(stdout))
374
        u_stdout = unicode(stdout, errors='replace')
19
376
        self.addDetail(cmd_prefix + ' stderr', binary_content(stderr))
375
        self.addDetail(cmd_prefix + ' stdout', text_content(u_stdout))
20
376
        u_stderr = unicode(stderr, errors='replace')
21
377
        self.addDetail(cmd_prefix + ' stderr', text_content(u_stderr))
22
377
        return retcode, stdout, stderr
378
        return retcode, stdout, stderr
23
378
379
24
379
    def get_ip_from_network_scan(self, mac_address):
380
    def get_ip_from_network_scan(self, mac_address):
25
380
381
26
=== modified file 'maastest/tests/test_kvmfixture.py'
27
--- maastest/tests/test_kvmfixture.py	2013-12-10 14:09:42 +0000
28
+++ maastest/tests/test_kvmfixture.py	2013-12-12 16:46:49 +0000
29
@@ -20,10 +20,7 @@
30
20
import fixtures
20
import fixtures
31
21
from lxml import etree
21
from lxml import etree
32
22
from maastest import kvmfixture
22
from maastest import kvmfixture
37
23
from maastest.utils import (
23
from maastest.utils import read_file
34
24
    binary_content,
35
25
    read_file,
36
26
    )
38
27
import mock
24
import mock
39
28
import netaddr
25
import netaddr
40
29
from six import text_type
26
from six import text_type
41
@@ -590,14 +587,14 @@
42
590
            (
587
            (
43
591
                text_type(return_value),
588
                text_type(return_value),
44
592
                input,
589
                input,
47
593
                binary_content(stdout_content),
590
                stdout_content,
48
594
                binary_content(stderr_content),
591
                stderr_content,
49
595
            ),
592
            ),
50
596
            (
593
            (
51
597
                details['cmd #0001 retcode'].as_text(),
594
                details['cmd #0001 retcode'].as_text(),
52
598
                details['cmd #0001 input'].as_text(),
595
                details['cmd #0001 input'].as_text(),
55
599
                details['cmd #0001 stdout'],
596
                details['cmd #0001 stdout'].as_text(),
56
600
                details['cmd #0001 stderr'],
597
                details['cmd #0001 stderr'].as_text(),
57
601
            ))
598
            ))
58
602
599
59
603
    def test_get_ip_from_network_scan(self):
600
    def test_get_ip_from_network_scan(self):
Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)		2013-12-12	Approve on 2013-12-12
Review via email: mp+198736@code.launchpad.net