[yast-commit] r49105 - in /trunk/runlevel: package/ testsuite/tests/

15 Jul 2008

Author: locilka
Date: Tue Jul 15 16:16:18 2008
New Revision: 49105

URL: http://svn.opensuse.org/viewcvs/yast?rev=49105&view=rev
Log:
Adjusted testsuites


Modified:
    trunk/runlevel/package/yast2-runlevel.changes
    trunk/runlevel/testsuite/tests/Filters.ycp
    trunk/runlevel/testsuite/tests/ServiceDependencies.ycp
    trunk/runlevel/testsuite/tests/dirtyServices.ycp
    trunk/runlevel/testsuite/tests/formatLine.ycp
    trunk/runlevel/testsuite/tests/getDefaultPicker.out
    trunk/runlevel/testsuite/tests/getDefaultPicker.ycp
    trunk/runlevel/testsuite/tests/getRunlevelDescr.ycp
    trunk/runlevel/testsuite/tests/getScripts.ycp
    trunk/runlevel/testsuite/tests/isDisabled.ycp
    trunk/runlevel/testsuite/tests/overviewText.ycp
    trunk/runlevel/testsuite/tests/saveServices.ycp
    trunk/runlevel/testsuite/tests/servicesToTable.ycp
    trunk/runlevel/testsuite/tests/setServiceToDefault.ycp

Modified: trunk/runlevel/package/yast2-runlevel.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.changes?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================

--- trunk/runlevel/package/yast2-runlevel.changes (original)
+++ trunk/runlevel/package/yast2-runlevel.changes Tue Jul 15 16:16:18 2008
@@ -4,6 +4,7 @@
 - Reading control file feature globals->rle_offer_rulevel_4
   in RunlevelEd module constructor whether to offer runlevel 4
   in UI, default is 'false' if not set (FATE #303798).
+- Adjusted testsuites.
 - 2.17.1
 
 -------------------------------------------------------------------

Modified: trunk/runlevel/testsuite/tests/Filters.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/Filters.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/Filters.ycp (original)
+++ trunk/runlevel/testsuite/tests/Filters.ycp Tue Jul 15 16:16:18 2008
@@ -3,6 +3,14 @@
     // testedfiles: RunlevelEd.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+	"target" : $[
+	    "size" : -1,
+	],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     import "RunlevelEd";
 
     RunlevelEd::services = $[

Modified: trunk/runlevel/testsuite/tests/ServiceDependencies.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/ServiceDependencies.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/ServiceDependencies.ycp (original)
+++ trunk/runlevel/testsuite/tests/ServiceDependencies.ycp Tue Jul 15 16:16:18 2008
@@ -9,13 +9,6 @@
     include "testsuite.ycp";
     import "Progress";
     import "Report";
-    import "RunlevelEd";
-    include "runlevel/toposort.ycp";
-
-    Progress::off ();
-    Report::DisplayErrors (false, 0);
-
-    DUMP (size (comments));
 
     // assume all the services are enabled
     map all_enabled = mapmap (string service, map descr, comments, ``(
@@ -32,6 +25,7 @@
 				      "stop": [],
 				      ]]
 				  ));
+
     map READ = $[
 	"init" : $[
 	    "insserv_conf": insserv_conf,
@@ -42,8 +36,23 @@
 		"comments" : comments,
 		"runlevels" : all_enabled,
 		]
-	    ]
+	    ],
+    	    "target" : $[
+        	"size" : -1,
+    	    ],
 	];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
+    import "RunlevelEd";
+    include "runlevel/toposort.ycp";
+
+    Progress::off ();
+    Report::DisplayErrors (false, 0);
+
+    DUMP (size (comments));
+
+
+
 
 
     TEST ( ``(RunlevelEd::Read ()), [READ], nil);

Modified: trunk/runlevel/testsuite/tests/dirtyServices.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/dirtyServices.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/dirtyServices.ycp (original)
+++ trunk/runlevel/testsuite/tests/dirtyServices.ycp Tue Jul 15 16:16:18 2008
@@ -7,6 +7,14 @@
     // testedfiles: RunlevelEd.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     import "RunlevelEd";
 
     RunlevelEd::services = $[

Modified: trunk/runlevel/testsuite/tests/formatLine.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/formatLine.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/formatLine.ycp (original)
+++ trunk/runlevel/testsuite/tests/formatLine.ycp Tue Jul 15 16:16:18 2008
@@ -3,6 +3,14 @@
     // testedfiles: ui.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     include "runlevel/ui.ycp";
 
     string s = "";

Modified: trunk/runlevel/testsuite/tests/getDefaultPicker.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/getDefaultPicker.out?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/getDefaultPicker.out (original)
+++ trunk/runlevel/testsuite/tests/getDefaultPicker.out Tue Jul 15 16:16:18 2008
@@ -1,3 +1,3 @@
 Dump	[`item (`id ("2"), "2: Local multiuser without remote network", false), `item (`id ("3"), "3: Full multiuser with network", true), `item (`id ("4"), "4: User defined", false), `item (`id ("5"), "5: Full multiuser with network and display manager", false)]
 Dump	[`item (`id ("2"), "2: Local multiuser without remote network", true), `item (`id ("7"), "7", false), `item (`id ("8"), "8", false)]
-Dump	[`item (`id (""), "Unchanged", false), `item (`id ("2"), "2: Local multiuser without remote network", false), `item (`id ("4"), "4: User defined", false), `item (`id ("7"), "7", false), `item (`id ("8"), "8", false)]
+Dump	[`item (`id (""), "Unchanged", false), `item (`id ("2"), "2: Local multiuser without remote network", false), `item (`id ("7"), "7", false), `item (`id ("8"), "8", false)]

Modified: trunk/runlevel/testsuite/tests/getDefaultPicker.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/getDefaultPicker.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/getDefaultPicker.ycp (original)
+++ trunk/runlevel/testsuite/tests/getDefaultPicker.ycp Tue Jul 15 16:16:18 2008
@@ -3,6 +3,14 @@
     // testedfiles: ui.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     import "RunlevelEd";
 
     RunlevelEd::runlevels = [ "S", "0", "1", "2", "3", "4", "5", "6", ];

Modified: trunk/runlevel/testsuite/tests/getRunlevelDescr.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/getRunlevelDescr.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/getRunlevelDescr.ycp (original)
+++ trunk/runlevel/testsuite/tests/getRunlevelDescr.ycp Tue Jul 15 16:16:18 2008
@@ -3,6 +3,14 @@
     // testedfiles: RunlevelEd.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     import "RunlevelEd";
 
     DUMP (RunlevelEd::getRunlevelDescr (""));

Modified: trunk/runlevel/testsuite/tests/getScripts.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/getScripts.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/getScripts.ycp (original)
+++ trunk/runlevel/testsuite/tests/getScripts.ycp Tue Jul 15 16:16:18 2008
@@ -8,10 +8,6 @@
     // testedfiles: RunlevelEd.ycp Testsuite.ycp
 
     include "testsuite.ycp";
-    import "RunlevelEd";
-    import "Progress";
-
-    Progress::off ();
 
     // outdated, does not matter
     map insserv_conf = $[
@@ -54,8 +50,20 @@
 		"current_runlevel" : "5",
 		"default_runlevel" : "5",
                 ]
-            ]
+            ],
+    	    "target" : $[
+        	"size" : -1,
+    	    ],
         ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
+    import "RunlevelEd";
+
+    import "Progress";
+
+    Progress::off ();
+
+
 
     TEST (``(RunlevelEd::Read ()), [READ] , 0);
     DUMP (RunlevelEd::services);

Modified: trunk/runlevel/testsuite/tests/isDisabled.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/isDisabled.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/isDisabled.ycp (original)
+++ trunk/runlevel/testsuite/tests/isDisabled.ycp Tue Jul 15 16:16:18 2008
@@ -7,6 +7,14 @@
     // testedfiles: RunlevelEd.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     import "RunlevelEd";
 
     DUMP (RunlevelEd::isDisabled ($[]));

Modified: trunk/runlevel/testsuite/tests/overviewText.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/overviewText.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/overviewText.ycp (original)
+++ trunk/runlevel/testsuite/tests/overviewText.ycp Tue Jul 15 16:16:18 2008
@@ -3,6 +3,14 @@
     // testedfiles: ui.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     import "RunlevelEd";
     include "runlevel/ui.ycp";
 

Modified: trunk/runlevel/testsuite/tests/saveServices.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/saveServices.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/saveServices.ycp (original)
+++ trunk/runlevel/testsuite/tests/saveServices.ycp Tue Jul 15 16:16:18 2008
@@ -7,10 +7,6 @@
     // testedfiles: RunlevelEd.ycp Service.ycp Testsuite.ycp
 
     include "testsuite.ycp";
-    import "RunlevelEd";
-    import "Progress";
-
-    Progress::off ();
 
     map READ = $[
 	"init": $[
@@ -18,7 +14,18 @@
 		"exists": true,
 		],
 	    ],
+    	    "target" : $[
+        	"size" : -1,
+    	    ],
 	];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
+    import "RunlevelEd";
+    import "Progress";
+
+    Progress::off ();
+
+
     map EXEC = $[
 	"target": $[
 	    "bash_output": $[ "exit": 0, "stdout": "", "stderr": "", ],

Modified: trunk/runlevel/testsuite/tests/servicesToTable.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/servicesToTable.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/servicesToTable.ycp (original)
+++ trunk/runlevel/testsuite/tests/servicesToTable.ycp Tue Jul 15 16:16:18 2008
@@ -3,6 +3,14 @@
     // testedfiles: ui.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     import "RunlevelEd";
     include "runlevel/ui.ycp";
 

Modified: trunk/runlevel/testsuite/tests/setServiceToDefault.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/testsuite/tests/setServiceToDefault.ycp?rev=49105&r1=49104&r2=49105&view=diff
==============================================================================
--- trunk/runlevel/testsuite/tests/setServiceToDefault.ycp (original)
+++ trunk/runlevel/testsuite/tests/setServiceToDefault.ycp Tue Jul 15 16:16:18 2008
@@ -3,7 +3,16 @@
     // testedfiles: ui.ycp Testsuite.ycp
 
     include "testsuite.ycp";
+
+    map READ = $[
+        "target" : $[
+            "size" : -1,
+        ],
+    ];
+    TESTSUITE_INIT ([READ, $[], $[]], nil);
+
     include "runlevel/ui.ycp";
+
     import "RunlevelEd";
 
     RunlevelEd::services = $[

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r49105 - in /trunk/runlevel: package/ testsuite/tests/

locilka＠svn.opensuse.org