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