adjust existing test cases

yast · Dec 21, 2017 · 732a57f · 732a57f
1 parent a6e741c
commit 732a57f
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 23 deletions.
diff --git a/test/data/devicegraphs/output/windows-pc-enc-sep-home.yml b/test/data/devicegraphs/output/windows-pc-enc-sep-home.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 745470 MiB
+        size: 745469 MiB
         name: /dev/sda1
         id: 0x7
         file_system: ntfs
@@ -25,7 +25,7 @@
           password: '12345678'
 
     - partition:
-        size: 12290 MiB
+        size: 12291 MiB
         name: "/dev/sda4"
         type: extended
         id: extended
@@ -43,7 +43,7 @@
           password: '12345678'
 
     - partition:
-        size: 10 GiB
+        size: 10241 MiB
         name: "/dev/sda6"
         type: logical
         id: linux

diff --git a/test/data/devicegraphs/output/windows-pc-enc.yml b/test/data/devicegraphs/output/windows-pc-enc.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 738.00 GiB
+        size: 755711 MiB
         name: /dev/sda1
         id: 0x7
         file_system: ntfs
@@ -35,6 +35,9 @@
           name: "/dev/mapper/cr_sda4"
           password: '12345678'
 
+    - free:
+        size: 1 MiB
+
     - partition:
         size: unlimited
         name: "/dev/sda2"

diff --git a/test/data/devicegraphs/output/windows-pc-gpt-enc-sep-home.yml b/test/data/devicegraphs/output/windows-pc-gpt-enc-sep-home.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 745471 MiB
+        size: 745470 MiB
         name: /dev/sda1
         id: windows_basic_data
         file_system: ntfs
@@ -40,7 +40,7 @@
           password: '12345678'
 
     - partition:
-        size: 10.00 GiB
+        size: 10241 MiB
         name: "/dev/sda6"
         id: linux
         file_system: xfs

diff --git a/test/data/devicegraphs/output/windows-pc-gpt-enc.yml b/test/data/devicegraphs/output/windows-pc-gpt-enc.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 755711 MiB
+        size: 755710 MiB
         name: /dev/sda1
         id: windows_basic_data
         file_system: ntfs
@@ -39,6 +39,9 @@
           name: "/dev/mapper/cr_sda5"
           password: '12345678'
 
+    - free:
+        size: 1 MiB
+
     - partition:
         size: unlimited
         name: "/dev/sda2"

diff --git a/test/data/devicegraphs/output/windows-pc-gpt-sep-home.yml b/test/data/devicegraphs/output/windows-pc-gpt-sep-home.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 745471 MiB
+        size: 745470 MiB
         name: /dev/sda1
         id: windows_basic_data
         file_system: ntfs
@@ -32,7 +32,7 @@
         mount_point: swap
 
     - partition:
-        size: 10.00 GiB
+        size: 10241 MiB
         name: "/dev/sda6"
         id: linux
         file_system: xfs

diff --git a/test/data/devicegraphs/output/windows-pc-gpt.yml b/test/data/devicegraphs/output/windows-pc-gpt.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 755711 MiB
+        size: 755710 MiB
         name: /dev/sda1
         id: windows_basic_data
         file_system: ntfs
@@ -31,6 +31,9 @@
         file_system: swap
         mount_point: swap
 
+    - free:
+        size: 1 MiB
+
     - partition:
         size: unlimited
         name: "/dev/sda2"

diff --git a/test/data/devicegraphs/output/windows-pc-mbr128-sep-home.yml b/test/data/devicegraphs/output/windows-pc-mbr128-sep-home.yml
@@ -7,7 +7,7 @@
     partitions:
 
     - partition:
-        size: 745470 MiB
+        size: 745469 MiB
         start: 128 KiB
         name: /dev/sda1
         id: 0x7
@@ -23,7 +23,7 @@
         mount_point: "/"
 
     - partition:
-        size: 12290 MiB
+        size: 12291 MiB
         name: "/dev/sda4"
         type: extended
         id: extended
@@ -37,7 +37,7 @@
         mount_point: swap
 
     - partition:
-        size: 10 GiB
+        size: 10241 MiB
         name: "/dev/sda6"
         type: logical
         id: linux

diff --git a/test/data/devicegraphs/output/windows-pc-mbr128.yml b/test/data/devicegraphs/output/windows-pc-mbr128.yml
@@ -7,7 +7,7 @@
     partitions:
 
     - partition:
-        size: 738.00 GiB
+        size: 755711 MiB
         start: 128 KiB
         name: /dev/sda1
         id: 0x7
@@ -29,6 +29,9 @@
         file_system: swap
         mount_point: swap
 
+    - free:
+        size: 1 MiB
+
     - partition:
         size: unlimited
         name: "/dev/sda2"

diff --git a/test/data/devicegraphs/output/windows-pc-mbr256-sep-home.yml b/test/data/devicegraphs/output/windows-pc-mbr256-sep-home.yml
@@ -7,7 +7,7 @@
     partitions:
 
     - partition:
-        size: 745470 MiB
+        size: 745469 MiB
         start: 256 KiB
         name: /dev/sda1
         id: 0x7
@@ -23,7 +23,7 @@
         mount_point: "/"
 
     - partition:
-        size: 12290 MiB
+        size: 12291 MiB
         name: "/dev/sda4"
         type: extended
         id: extended
@@ -37,7 +37,7 @@
         mount_point: swap
 
     - partition:
-        size: 10 GiB
+        size: 10241 MiB
         name: "/dev/sda6"
         type: logical
         id: linux

diff --git a/test/data/devicegraphs/output/windows-pc-mbr256.yml b/test/data/devicegraphs/output/windows-pc-mbr256.yml
@@ -7,7 +7,7 @@
     partitions:
 
     - partition:
-        size: 738.00 GiB
+        size: 755711 MiB
         start: 256 KiB
         name: /dev/sda1
         id: 0x7
@@ -29,6 +29,9 @@
         file_system: swap
         mount_point: swap
 
+    - free:
+        size: 1 MiB
+
     - partition:
         size: unlimited
         name: "/dev/sda2"

diff --git a/test/data/devicegraphs/output/windows-pc-sep-home.yml b/test/data/devicegraphs/output/windows-pc-sep-home.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 745470 MiB
+        size: 745469 MiB
         name: /dev/sda1
         id: 0x7
         file_system: ntfs
@@ -21,7 +21,7 @@
         mount_point: "/"
 
     - partition:
-        size: 12290 MiB
+        size: 12291 MiB
         name: "/dev/sda4"
         type: extended
         id: extended
@@ -35,7 +35,7 @@
         mount_point: swap
 
     - partition:
-        size: 10 GiB
+        size: 10241 MiB
         name: "/dev/sda6"
         type: logical
         id: linux

diff --git a/test/data/devicegraphs/output/windows-pc.yml b/test/data/devicegraphs/output/windows-pc.yml
@@ -6,7 +6,7 @@
     partitions:
 
     - partition:
-        size: 738.00 GiB
+        size: 755711 MiB
         name: /dev/sda1
         id: 0x7
         file_system: ntfs
@@ -27,6 +27,9 @@
         file_system: swap
         mount_point: swap
 
+    - free:
+       size: 1 MiB
+
     - partition:
         size: unlimited
         name: "/dev/sda2"

diff --git a/test/y2storage/proposal/space_maker_test.rb b/test/y2storage/proposal/space_maker_test.rb
@@ -296,7 +296,7 @@ def probed_partition(name)
             it "resizes Windows partitions to free additional needed space" do
               result = maker.provide_space(fake_devicegraph, volumes, lvm_helper)
               expect(result[:devicegraph].partitions).to contain_exactly(
-                an_object_having_attributes(filesystem_label: "windows", size: 200.GiB - 1.MiB)
+                an_object_having_attributes(filesystem_label: "windows", size: 200.GiB - 2.MiB)
               )
             end
           end