Author: aschnell Date: Tue Dec 8 12:35:52 2009 New Revision: 59999 URL: http://svn.opensuse.org/viewcvs/yast?rev=59999&view=rev Log: - use helpers Added: trunk/storage/storage/src/testsuite/tests/proposal2.err trunk/storage/storage/src/testsuite/tests/proposal2.out trunk/storage/storage/src/testsuite/tests/proposal2.ycp Modified: trunk/storage/storage/src/testsuite/tests/proposal1.out trunk/storage/storage/src/testsuite/tests/proposal1.ycp Modified: trunk/storage/storage/src/testsuite/tests/proposal1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/proposal1.out?rev=59999&r1=59998&r2=59999&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/proposal1.out (original) +++ trunk/storage/storage/src/testsuite/tests/proposal1.out Tue Dec 8 12:35:52 2009 @@ -0,0 +1,5 @@ +Dump Proposal: +Dump Create extended partition /dev/sda3 (147.09 GB) +Dump Create swap partition /dev/sda5 (2.01 GB) +Dump Create root partition /dev/sda6 (20.00 GB) with ext4 +Dump Create partition /dev/sda7 (125.08 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/proposal1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/proposal1.ycp?rev=59999&r1=59998&r2=59999&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/proposal1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/proposal1.ycp Tue Dec 8 12:35:52 2009 @@ -1,66 +1,15 @@ { - include "testsuite.ycp"; + include "./lib/setup-system.ycp"; - map READ = $[ - "probe" : $[ - "architecture" : "i385", - "cdrom" : [] - ], - "proc" : $[ - "swaps" : [] - ], - "sysconfig" : $[ - "storage" : $[ - "DEFAULT_FS" : "ext4" - ], - "bootloader" : $[ - "LOADER_TYPE" : "grub" - ], - "language" : $[ - "RC_LANG" : "en_US.UTF-8", - "RC_LC_MESSAGES" : "", - ], - ], - "target" : $[ - "size" : 0, - "bash_output" : $[], - "yast2" : $[], - "dir" : [], - ], - ]; + setup_system("one-half-empty"); - TESTSUITE_INIT([READ, $[], READ], nil); + include "./lib/helper1a.ycp"; - - import "Storage"; - import "StorageProposal"; import "ProductFeatures"; ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true); ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false); - ProductFeatures::SetStringFeature("partitioning", "root_base_size", "25 GB"); - - StorageProposal::GetControlCfg(); - - map<string, map> target_map = Storage::GetTargetMap(); - map<string, any> prop = StorageProposal::get_inst_prop(target_map); - - if (prop["ok"]:false) - { - Storage::SetTargetMap(prop["target"]:$[]); - - list<map> infos = Storage::GetCommitInfos(); + ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - DUMP("Proposal:"); - foreach(map info, infos, { - string text = info[`text]:""; - if (info[`destructive]:false) - text = text + " [destructive]"; - DUMP(text); - }); - } - else - { - DUMP("No proposal."); - } + include "./lib/helper1b.ycp"; } Added: trunk/storage/storage/src/testsuite/tests/proposal2.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/proposal2.err?rev=59999&view=auto ============================================================================== (empty) Added: trunk/storage/storage/src/testsuite/tests/proposal2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/proposal2.out?rev=59999&view=auto ============================================================================== --- trunk/storage/storage/src/testsuite/tests/proposal2.out (added) +++ trunk/storage/storage/src/testsuite/tests/proposal2.out Tue Dec 8 12:35:52 2009 @@ -0,0 +1,7 @@ +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (29.99 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (19.49 GB) for /home with ext4 +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (512.00 MB) Added: trunk/storage/storage/src/testsuite/tests/proposal2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/proposal2.ycp?rev=59999&view=auto ============================================================================== --- trunk/storage/storage/src/testsuite/tests/proposal2.ycp (added) +++ trunk/storage/storage/src/testsuite/tests/proposal2.ycp Tue Dec 8 12:35:52 2009 @@ -0,0 +1,16 @@ +{ + include "./lib/setup-system.ycp"; + + setup_system("one-empty"); + + include "./lib/helper1a.ycp"; + + import "ProductFeatures"; + + ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true); + ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", true); + ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); + ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); + + include "./lib/helper1b.ycp"; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org