Skip to content

Commit

Permalink
Merge pull request #69 from aschnell/master
Browse files Browse the repository at this point in the history
- also check flex proposal from ProductFeatures
  • Loading branch information
aschnell committed May 19, 2014
2 parents c7cba8a + 3937713 commit 9d0274c
Show file tree
Hide file tree
Showing 18 changed files with 188 additions and 0 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file.
27 changes: 27 additions & 0 deletions testsuite/tests/flex-xml-empty-efi1.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Dump Proposal:
Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat
Dump Create swap volume /dev/sda2 (1.00 GiB)
Dump Create volume /dev/sda3 (288.93 GiB) for /data with btrfs
Dump Create root volume /dev/sda4 (8.01 GiB) with btrfs
Dump Create subvolume boot/grub2/i386-pc on device /dev/sda4
Dump Create subvolume boot/grub2/x86_64-efi on device /dev/sda4
Dump Create subvolume home on device /dev/sda4
Dump Create subvolume opt on device /dev/sda4
Dump Create subvolume srv on device /dev/sda4
Dump Create subvolume tmp on device /dev/sda4
Dump Create subvolume usr/local on device /dev/sda4
Dump Create subvolume var/crash on device /dev/sda4
Dump Create subvolume var/lib/mailman on device /dev/sda4
Dump Create subvolume var/lib/named on device /dev/sda4
Dump Create subvolume var/lib/pgqsl on device /dev/sda4
Dump Create subvolume var/log on device /dev/sda4
Dump Create subvolume var/opt on device /dev/sda4
Dump Create subvolume var/spool on device /dev/sda4
Dump Create subvolume var/tmp on device /dev/sda4
Dump
Dump Target Map Excerpt:
Dump device:/dev/sda label:gpt
Dump device:/dev/sda1 fsid:0x103
Dump device:/dev/sda2 fsid:0x82
Dump device:/dev/sda3 fsid:0x83
Dump device:/dev/sda4 fsid:0x83
37 changes: 37 additions & 0 deletions testsuite/tests/flex-xml-empty-efi1.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# encoding: utf-8

# testedfiles: helper.rb

module Yast

class TestClient < Client

def main

def setup1()
setup_system("empty-efi")
end

def setup2()
ProductFeatures.SetBooleanFeature("partitioning", "use_flexible_partitioning", true)
ProductFeatures.SetFeature("partitioning", "flexible_partitioning", {
"partitions" => [
{ "mount" => "/", "size" => "8GB" },
{ "mount" => "swap", "size" => "1GB" },
{ "mount" => "/data", "sizepct" => "100" }
]
})
end

def setup3()
end

Yast.include self, "helper.rb"

end

end

end

Yast::TestClient.new.main
Empty file.
26 changes: 26 additions & 0 deletions testsuite/tests/flex-xml-empty-ppc64le1.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Dump Proposal:
Dump Create PPC PReP volume /dev/sda1 (7.84 MiB)
Dump Create swap volume /dev/sda2 (1.00 GiB)
Dump Create volume /dev/sda3 (289.07 GiB) for /data with btrfs
Dump Create root volume /dev/sda4 (8.01 GiB) with btrfs
Dump Create subvolume boot/grub2/power-ieee1275 on device /dev/sda4
Dump Create subvolume home on device /dev/sda4
Dump Create subvolume opt on device /dev/sda4
Dump Create subvolume srv on device /dev/sda4
Dump Create subvolume tmp on device /dev/sda4
Dump Create subvolume usr/local on device /dev/sda4
Dump Create subvolume var/crash on device /dev/sda4
Dump Create subvolume var/lib/mailman on device /dev/sda4
Dump Create subvolume var/lib/named on device /dev/sda4
Dump Create subvolume var/lib/pgqsl on device /dev/sda4
Dump Create subvolume var/log on device /dev/sda4
Dump Create subvolume var/opt on device /dev/sda4
Dump Create subvolume var/spool on device /dev/sda4
Dump Create subvolume var/tmp on device /dev/sda4
Dump
Dump Target Map Excerpt:
Dump device:/dev/sda label:msdos
Dump device:/dev/sda1 fsid:0x41
Dump device:/dev/sda2 fsid:0x82
Dump device:/dev/sda3 fsid:0x83
Dump device:/dev/sda4 fsid:0x83
37 changes: 37 additions & 0 deletions testsuite/tests/flex-xml-empty-ppc64le1.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# encoding: utf-8

# testedfiles: helper.rb

module Yast

class TestClient < Client

def main

def setup1()
setup_system("empty-ppc64le")
end

def setup2()
ProductFeatures.SetBooleanFeature("partitioning", "use_flexible_partitioning", true)
ProductFeatures.SetFeature("partitioning", "flexible_partitioning", {
"partitions" => [
{ "mount" => "/", "size" => "8GB" },
{ "mount" => "swap", "size" => "1GB" },
{ "mount" => "/data", "sizepct" => "100" }
]
})
end

def setup3()
end

Yast.include self, "helper.rb"

end

end

end

Yast::TestClient.new.main
Empty file.
24 changes: 24 additions & 0 deletions testsuite/tests/flex-xml-empty1.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Dump Proposal:
Dump Create swap volume /dev/sda1 (1.00 GiB)
Dump Create volume /dev/sda2 (289.08 GiB) for /data with btrfs
Dump Create root volume /dev/sda3 (8.01 GiB) with btrfs
Dump Create subvolume boot/grub2/i386-pc on device /dev/sda3
Dump Create subvolume home on device /dev/sda3
Dump Create subvolume opt on device /dev/sda3
Dump Create subvolume srv on device /dev/sda3
Dump Create subvolume tmp on device /dev/sda3
Dump Create subvolume usr/local on device /dev/sda3
Dump Create subvolume var/crash on device /dev/sda3
Dump Create subvolume var/lib/mailman on device /dev/sda3
Dump Create subvolume var/lib/named on device /dev/sda3
Dump Create subvolume var/lib/pgqsl on device /dev/sda3
Dump Create subvolume var/log on device /dev/sda3
Dump Create subvolume var/opt on device /dev/sda3
Dump Create subvolume var/spool on device /dev/sda3
Dump Create subvolume var/tmp on device /dev/sda3
Dump
Dump Target Map Excerpt:
Dump device:/dev/sda label:msdos
Dump device:/dev/sda1 fsid:0x82
Dump device:/dev/sda2 fsid:0x83
Dump device:/dev/sda3 fsid:0x83
37 changes: 37 additions & 0 deletions testsuite/tests/flex-xml-empty1.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# encoding: utf-8

# testedfiles: helper.rb

module Yast

class TestClient < Client

def main

def setup1()
setup_system("empty")
end

def setup2()
ProductFeatures.SetBooleanFeature("partitioning", "use_flexible_partitioning", true)
ProductFeatures.SetFeature("partitioning", "flexible_partitioning", {
"partitions" => [
{ "mount" => "/", "size" => "8GB" },
{ "mount" => "swap", "size" => "1GB" },
{ "mount" => "/data", "sizepct" => "100" }
]
})
end

def setup3()
end

Yast.include self, "helper.rb"

end

end

end

Yast::TestClient.new.main

0 comments on commit 9d0274c

Please sign in to comment.