Checkbox Support Library

Merge ~kissiel/checkbox-support:change-patched-open into checkbox-support:master

  1. Git
  2. lp:~kissiel/checkbox-support
  3. change-patched-open
  4. Merge into master
Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 18014fa3ab67df80847c4b84fc35aa1081e7f5d4
Merged at revision: 670c2cded791032c72bbac15d49e5b68c7db6b07
Proposed branch: ~kissiel/checkbox-support:change-patched-open
Merge into: checkbox-support:master
Diff against target: 58 lines (+6/-6)
1 file modified
checkbox_support/parsers/tests/test_sysfs_usb.py (+6/-6)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+392285@code.launchpad.net

Description of the change

patch 'builtin.open' instead of the module's one

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/checkbox_support/parsers/tests/test_sysfs_usb.py b/checkbox_support/parsers/tests/test_sysfs_usb.py
2index 2ef681e..a47f0a7 100644
3--- a/checkbox_support/parsers/tests/test_sysfs_usb.py
4+++ b/checkbox_support/parsers/tests/test_sysfs_usb.py
5@@ -62,7 +62,7 @@ class TestUsbIds(TestCase):
6 def test_empty(self):
7 """Test empty database."""
8 mopen = mock_open(read_data='')
9- with patch('checkbox_support.parsers.sysfs_usb.open', mopen):
10+ with patch('builtins.open', mopen):
11 ids = UsbIds()
12 with self.assertRaises(KeyError):
13 ids.decode_product(42, 42)
14@@ -75,7 +75,7 @@ class TestUsbIds(TestCase):
15 \t0042 Seafourium
16 """)
17 mopen = mock_open(read_data=usb_ids_content)
18- with patch('checkbox_support.parsers.sysfs_usb.open', mopen):
19+ with patch('builtins.open', mopen):
20 ids = UsbIds()
21 self.assertEqual(ids.decode_product(0x42, 0x42), 'ACME Seafourium')
22
23@@ -85,7 +85,7 @@ class TestUsbIds(TestCase):
24 0042 ACME
25 """)
26 mopen = mock_open(read_data=usb_ids_content)
27- with patch('checkbox_support.parsers.sysfs_usb.open', mopen):
28+ with patch('builtins.open', mopen):
29 ids = UsbIds()
30 self.assertEqual(ids.decode_vendor(0x42), 'ACME')
31
32@@ -97,7 +97,7 @@ class TestUsbIds(TestCase):
33 \t\t01 Boom
34 """)
35 mopen = mock_open(read_data=usb_ids_content)
36- with patch('checkbox_support.parsers.sysfs_usb.open', mopen):
37+ with patch('builtins.open', mopen):
38 ids = UsbIds()
39 self.assertEqual(ids.decode_protocol(0x42, 0x06, 0x01),
40 'Explosives:Bomb:Boom')
41@@ -109,7 +109,7 @@ class TestUsbIds(TestCase):
42 \t06 Bomb
43 """)
44 mopen = mock_open(read_data=usb_ids_content)
45- with patch('checkbox_support.parsers.sysfs_usb.open', mopen):
46+ with patch('builtins.open', mopen):
47 ids = UsbIds()
48 self.assertEqual(ids.decode_protocol(0x42, 0x06, 0x01),
49 'Explosives:Bomb')
50@@ -120,7 +120,7 @@ class TestUsbIds(TestCase):
51 C 42 Explosives
52 """)
53 mopen = mock_open(read_data=usb_ids_content)
54- with patch('checkbox_support.parsers.sysfs_usb.open', mopen):
55+ with patch('builtins.open', mopen):
56 ids = UsbIds()
57 self.assertEqual(ids.decode_protocol(0x42, 0x06, 0x01),
58 'Explosives')

Subscribers

People subscribed via source and target branches