Ubuntu Pastebin

Paste from lamont at Thu, 23 Mar 2017 23:26:04 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
=== modified file 'src/provisioningserver/refresh/node_info_scripts.py'
--- provisioningserver/refresh/node_info_scripts.py	2017-03-17 10:54:40 +0000
+++ provisioningserver/refresh/node_info_scripts.py	2017-03-22 17:21:37 +0000
@@ -313,7 +313,7 @@
     blockdevs = []
     block_list = check_output((
         "lsblk", "--exclude", "1,2,7", "-d", "-P",
-        "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME"))
+        "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN"))
     block_list = block_list.decode("utf-8")
     for blockdev in block_list.splitlines():
         tokens = shlex.split(blockdev)

=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
--- provisioningserver/refresh/tests/test_node_info_scripts.py	2017-03-22 14:19:07 +0000
+++ provisioningserver/refresh/tests/test_node_info_scripts.py	2017-03-22 17:21:37 +0000
@@ -399,7 +399,7 @@
         self.call_gather_physical_block_devices()
         self.assertThat(check_output, MockCalledOnceWith((
             "lsblk", "--exclude", "1,2,7", "-d", "-P",
-            "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME")))
+            "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN")))
 
     def test__returns_empty_list_when_no_disks(self):
         check_output = self.patch(subprocess, "check_output")
@@ -419,7 +419,7 @@
         self.assertThat(check_output, MockCallsMatch(
             call((
                 "lsblk", "--exclude", "1,2,7", "-d", "-P",
-                "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME")),
+                "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN")),
             call(("udevadm", "info", "-q", "all", "-n", name))))
 
     def test__returns_empty_list_when_cdrom_only(self):
@@ -451,7 +451,7 @@
         self.assertThat(check_output, MockCallsMatch(
             call((
                 "lsblk", "--exclude", "1,2,7", "-d", "-P",
-                "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME")),
+                "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN")),
             call(("udevadm", "info", "-q", "all", "-n", name)),
             call(("sudo", "-n", "blockdev", "--getsize64", "/dev/%s" % name)),
             call(("sudo", "-n", "blockdev", "--getbsz", "/dev/%s" % name))))
Download as text