December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59990 - in /trunk/network/testsuite/tests: Network_YaPI.out Network_YaPI.ycp Routing.out
by kmachalkova＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: kmachalkova Date: Mon Dec 7 18:03:14 2009 New Revision: 59990 URL: http://svn.opensuse.org/viewcvs/yast?rev=59990&view=rev Log: Fixed testsuite Modified: trunk/network/testsuite/tests/Network_YaPI.out trunk/network/testsuite/tests/Network_YaPI.ycp trunk/network/testsuite/tests/Routing.out Modified: trunk/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_… ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.out (original) +++ trunk/network/testsuite/tests/Network_YaPI.out Mon Dec 7 18:03:14 2009 @@ -11,6 +11,8 @@ Read .target.string "/etc/HOSTNAME" "laptop.suse.cz" Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] +Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 +Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil Dir .network.section: ["eth0", "eth1"] Dir .network.value."eth0": ["BOOTPROTO"] @@ -37,9 +39,12 @@ Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] +Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil +Read .init.scripts.exists "SuSEfirewall2_init" false Write .sysconfig.sysctl.IP_FORWARD "no" true Write .sysconfig.sysctl.IPV6_FORWARD "no" true +Write .sysconfig.sysctl nil true Execute .target.bash "echo 0 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 27 Modified: trunk/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_… ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.ycp (original) +++ trunk/network/testsuite/tests/Network_YaPI.ycp Mon Dec 7 18:03:14 2009 @@ -3,6 +3,11 @@ import "YaPI::NETWORK"; map READ = $[ + "init" : $[ + "scripts" :$[ + "exists" : false + ] + ], "target" : $[ "size":27, "string" : "laptop.suse.cz", Modified: trunk/network/testsuite/tests/Routing.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Routing.… ============================================================================== --- trunk/network/testsuite/tests/Routing.out (original) +++ trunk/network/testsuite/tests/Routing.out Mon Dec 7 18:03:14 2009 @@ -8,6 +8,7 @@ Return true Write .sysconfig.sysctl.IP_FORWARD "yes" true Write .sysconfig.sysctl.IPV6_FORWARD "yes" true +Write .sysconfig.sysctl nil true Execute .target.bash "echo 1 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59989 - in /branches/SuSE-Code-11-SP1-Branch/network: package/yast2-network.changes testsuite/tests/Network_YaPI.out testsuite/tests/Network_YaPI.ycp testsuite/tests/Routing.out
by mzugec＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: mzugec Date: Mon Dec 7 17:26:31 2009 New Revision: 59989 URL: http://svn.opensuse.org/viewcvs/yast?rev=59989&view=rev Log: fixed testsuite Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.ycp branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Routing.out Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Dec 7 17:26:31 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 30 09:50:12 CET 2009 - mzugec(a)suse.de + +- fixed testsuite + +------------------------------------------------------------------- Tue Dec 1 13:51:08 CET 2009 - mzugec(a)suse.cz - ISDN: fixed creating configuration with incorrect name (bnc#534504) Modified: branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out (original) +++ branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out Mon Dec 7 17:26:31 2009 @@ -11,6 +11,8 @@ Read .target.string "/etc/HOSTNAME" "laptop.suse.cz" Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] +Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 +Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil Dir .network.section: ["eth0", "eth1"] Dir .network.value."eth0": ["BOOTPROTO"] @@ -37,9 +39,12 @@ Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] +Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil +Read .init.scripts.exists "SuSEfirewall2_init" false Write .sysconfig.sysctl.IP_FORWARD "no" true Write .sysconfig.sysctl.IPV6_FORWARD "no" true +Write .sysconfig.sysctl nil true Execute .target.bash "echo 0 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 27 Modified: branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.ycp Mon Dec 7 17:26:31 2009 @@ -3,6 +3,11 @@ import "YaPI::NETWORK"; map READ = $[ + "init" : $[ + "scripts" :$[ + "exists" : false + ] + ], "target" : $[ "size":27, "string" : "laptop.suse.cz", Modified: branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Routing.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Routing.out (original) +++ branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Routing.out Mon Dec 7 17:26:31 2009 @@ -8,6 +8,7 @@ Return true Write .sysconfig.sysctl.IP_FORWARD "yes" true Write .sysconfig.sysctl.IPV6_FORWARD "yes" true +Write .sysconfig.sysctl nil true Execute .target.bash "echo 1 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59988 - /trunk/storage/storage/src/testsuite/diff_out
by aschnell＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: aschnell Date: Mon Dec 7 17:02:12 2009 New Revision: 59988 URL: http://svn.opensuse.org/viewcvs/yast?rev=59988&view=rev Log: - removed nonfunctional script Removed: trunk/storage/storage/src/testsuite/diff_out -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59987 - /trunk/storage/storage/src/testsuite/tests/proposal1.ycp
by aschnell＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: aschnell Date: Mon Dec 7 17:01:41 2009 New Revision: 59987 URL: http://svn.opensuse.org/viewcvs/yast?rev=59987&view=rev Log: - fixed logging of proposal Modified: trunk/storage/storage/src/testsuite/tests/proposal1.ycp Modified: trunk/storage/storage/src/testsuite/tests/proposal1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/proposal1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/proposal1.ycp Mon Dec 7 17:01:41 2009 @@ -47,7 +47,7 @@ DUMP("Proposal:"); foreach(map info, infos, { - string text = info["text"]:""; + string text = info[`text]:""; if (info["destructive"]:false) text = text + " [destructive]"; DUMP(text); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59986 - /trunk/testsuite/skel/Makefile.am
by aschnell＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: aschnell Date: Mon Dec 7 16:52:39 2009 New Revision: 59986 URL: http://svn.opensuse.org/viewcvs/yast?rev=59986&view=rev Log: - we don't use .cvsignore anymore Modified: trunk/testsuite/skel/Makefile.am Modified: trunk/testsuite/skel/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/Makefile.am?rev=5… ============================================================================== --- trunk/testsuite/skel/Makefile.am (original) +++ trunk/testsuite/skel/Makefile.am Mon Dec 7 16:52:39 2009 @@ -13,7 +13,6 @@ unix.exp \ unknown.exp \ Makefile_am \ - _cvsignore \ testsuite.exp \ runtest.sh -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59985 - in /trunk/network: package/yast2-network.changes src/modules/Proxy.ycp
by kmachalkova＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: kmachalkova Date: Mon Dec 7 16:48:52 2009 New Revision: 59985 URL: http://svn.opensuse.org/viewcvs/yast?rev=59985&view=rev Log: Do not show message on update Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Dec 7 16:48:52 2009 @@ -5,6 +5,7 @@ when enabling/disabling IP forwarding in routing settings. This avoids overwriting sysctl variables by SuSEFirewall init scripts (bnc#474304) +- Show proxy relogin msg only in Mode::normal (bnc#543469) ------------------------------------------------------------------- Tue Dec 1 11:24:25 CET 2009 - mzugec(a)suse.de Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Mon Dec 7 16:48:52 2009 @@ -168,8 +168,8 @@ sleep(sl); Progress::NextStage(); - //user can't relogin in installation, do not show the msg then (#486037) - if (!Mode::config () && !Mode::installation()) + //user can't relogin in installation and update, do not show the msg then (bnc#486037, bnc#543469) + if (Mode::normal()) ProxyFinishPopup(true); /* Update /root/.wgetrc */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59984 - in /trunk/storage/storage/src/testsuite: ./ config/ lib/ run/ tests/ tests_propose/
by aschnell＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: aschnell Date: Mon Dec 7 16:45:41 2009 New Revision: 59984 URL: http://svn.opensuse.org/viewcvs/yast?rev=59984&view=rev Log: - started work on testsuite for storage proposal Added: trunk/storage/storage/src/testsuite/Makefile.am trunk/storage/storage/src/testsuite/lib/test.exp trunk/storage/storage/src/testsuite/lib/test_init.exp trunk/storage/storage/src/testsuite/run/ trunk/storage/storage/src/testsuite/run/runtest.sh (with props) trunk/storage/storage/src/testsuite/tests/proposal1.err trunk/storage/storage/src/testsuite/tests/proposal1.out trunk/storage/storage/src/testsuite/tests/proposal1.ycp Removed: trunk/storage/storage/src/testsuite/tests/auto_part_functions.ycp trunk/storage/storage/src/testsuite/tests/runtest.sh trunk/storage/storage/src/testsuite/tests/test_inst_target_part.ycp trunk/storage/storage/src/testsuite/tests_propose/ Modified: trunk/storage/storage/src/testsuite/config/unix.exp Added: trunk/storage/storage/src/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/Ma… ============================================================================== --- trunk/storage/storage/src/testsuite/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/Makefile.am Mon Dec 7 16:45:41 2009 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Modified: trunk/storage/storage/src/testsuite/config/unix.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/co… ============================================================================== --- trunk/storage/storage/src/testsuite/config/unix.exp (original) +++ trunk/storage/storage/src/testsuite/config/unix.exp Mon Dec 7 16:45:41 2009 @@ -1,5 +1,114 @@ -load_lib "partitioning_init.exp" +# YaST2: modules testsuite +# +# Description: +# Main config file +# +# Author: +# Michal Svec <msvec(a)suse.cz> +# +# $Id$ -proc partitioning_exit {} {} -proc partitioning_version {} {} +proc testsuite_exit {} {} +proc testsuite_version {} {} +# Run one test + +proc testsuite-run { src } { + + set path [split $src "/"] + set filename [lindex $path [expr [llength $path]-1]] + + # extract basename and check extension + + set fname [split $filename "."] + + if {[llength $fname] < 2} { + fail "Bad filename syntax '$src'" + return -1 + } + if {[lindex $fname [expr [llength $fname]-1]] != "ycp"} { + fail "Not .ycp extension '$src'" + return -1 + } + + # setup filenames + + # $src is the name of the original testfile with absolute path + # tests/$filename is the name of the original testfile with relative path, + # relative to the testsuite directory + set test_input "tests/$filename" + + set base_name [lindex $fname 0] + + set stdout_name "tests/$base_name.out" + set stderr_name "tests/$base_name.err" + set log_name "tests/$base_name.log" + set tmpout_name "tmp.out.$base_name" + set tmperr_name "tmp.err.$base_name" + set tmplog_name "tmp.log.$base_name" + + # fate#2306: enable make check *gasp* before make install + # by searching in the source directory + set options "" + # first hack: look for the usual suspects + # (next steps: use YCPCFLAGS) + set sourcedir "../src" + if {[file isdirectory $sourcedir]} { + set options "-I $sourcedir -M $sourcedir" + } + + puts "Running $base_name ..." + + # run the test + + set result "" + set oops [catch { set result [exec "run/runtest.sh" $options "$test_input" "$tmpout_name" "$tmperr_name" ] } catched] + + if {$oops != 0} { + fail "Test case failed for $base_name: $catched" + return -1 + } + + # check return code from runycp + + if {$result != ""} { + warning "Compilation of $base_name results in '$result'" + return -1 + } + + # check stderr + + if {[diff $stderr_name "tmp.err.$base_name"] != 1} { + fail "Wrong stderr for $base_name" + set oops [catch { set result [exec test -f $stderr_name] } catched ] + if {$oops == 0} { + puts "\nThe diff follows...\n" + puts [exec sh -c "diff -u $stderr_name tmp.err.$base_name || true"] + puts "" + fail "Wrong stderr for $base_name" + puts "See the diff above." + } + return -1 + } + + # check stdout + + if {[diff $stdout_name "tmp.out.$base_name"] != 1} { + fail "Wrong stdout for $base_name" + set oops [catch { set result [exec test -f $stdout_name] } catched ] + if {$oops == 0} { + puts "\nThe diff follows...\n" + puts [exec sh -c "diff -u $stdout_name tmp.out.$base_name || true"] + puts "" + fail "Wrong stdout for $base_name" + puts "See the diff above." + } + return -1 + } + + # ok, all is fine + + pass $base_name + + return 0 +} Added: trunk/storage/storage/src/testsuite/lib/test.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/li… ============================================================================== --- trunk/storage/storage/src/testsuite/lib/test.exp (added) +++ trunk/storage/storage/src/testsuite/lib/test.exp Mon Dec 7 16:45:41 2009 @@ -0,0 +1 @@ +# anyagent.exp -- empty Added: trunk/storage/storage/src/testsuite/lib/test_init.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/li… ============================================================================== --- trunk/storage/storage/src/testsuite/lib/test_init.exp (added) +++ trunk/storage/storage/src/testsuite/lib/test_init.exp Mon Dec 7 16:45:41 2009 @@ -0,0 +1,68 @@ +# +# run a anyagent file +# +proc anyagent-run { src } { + + set path [split $src "/"] + set filename [lindex $path [expr [llength $path]-1]] + + # extract basename and check extension + + set fname [split $filename "."] + + if {[llength $fname] < 2} { + fail "Bad filename syntax '$src'" + return + } + if {[lindex $fname [expr [llength $fname]-1]] != "anyagent"} { + fail "Not .anyagent extension '$src'" + return + } + + # setup filenames + + set base_name [lindex $fname 0] + + set stdout_name "tests/$base_name.out" + set stderr_name "tests/$base_name.err" + set tmpout_name "tmp.out.$base_name" + set tmperr_name "tmp.err.$base_name" + # run the test + + puts "Running $base_name..." + + set result "" + set oops [catch { set result [exec "../anyagent" "stdio" "anyagent" "<$src" ">$tmpout_name" "2>$tmperr_name"] } catched] + + if {$oops != 0} { + fail "y2anyagent failed: $catched" + return + } + + # check return code from y2anyagent + + if {$result != ""} { + warning "Compilation of $base_name results in '$result'" + return + } + + # check stdout + + if {[diff $stdout_name $tmpout_name] != 1} { + fail "Wrong stdout for $base_name" + return + } + + # check stderr +# D I S A B L E D +# if {[diff $stderr_name $tmperr_name] != 1} { +# fail "Wrong stderr for $base_name" +# return +# } +# + # ok, all is fine + + pass $base_name + + return +} Added: trunk/storage/storage/src/testsuite/run/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/ru… ============================================================================== --- trunk/storage/storage/src/testsuite/run/runtest.sh (added) +++ trunk/storage/storage/src/testsuite/run/runtest.sh Mon Dec 7 16:45:41 2009 @@ -0,0 +1,94 @@ +#! /bin/bash + +# Run test on one ycp file +# Michal Svec <msvec(a)suse.cz> +# +# $1 = script.ycp +# $2 = stdout +# $3 = stderr +# +# These arguments may be preceded by options that will be passed to y2base +# +# $Id: runtest.sh 46223 2008-04-08 11:09:51Z mvidner $ + +while [ $# -gt 3 ]; do + OPTIONS="$OPTIONS $1" + shift +done + +unset LANG +unset LC_CTYPE +unset LC_NUMERIC +unset LC_TIME +unset LC_COLLATE +unset LC_MONETARY +unset LC_MESSAGES +unset LC_PAPER +unset LC_NAME +unset LC_ADDRESS +unset LC_TELEPHONE +unset LC_MEASUREMENT +unset LC_IDENTIFICATION +unset LC_ALL + +unset Y2DEBUG +unset Y2DEBUGALL +# export Y2DEBUG=1 +# export Y2DEBUGALL=1 +export Y2ALLGLOBAL=1 + +ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +Y2BASE=$ybindir/y2base +logconf="$yast2dir/data/testsuite/log.conf" + +if [ ! -f "$logconf" ]; then + logconf="../skel/log.conf" +fi + +DUMMY_LOG_STRING="LOGTHIS_SECRET_314 " + +files="$(grep '^[/*[:space:]]*testedfiles:' "$1"|sed 's/.*testedfiles:[[:space:]]*//g')" +if [ "$files" ]; then + echo "$files" >> testsuite.log + regex="[ /](testsuite\.ycp|Testsuite\.ycp|$(echo "$files"|sed 's|\.|\\.|g'|sed 's| |\||g')):" +fi +echo "$regex" >> testsuite.log + +parse() { + file="`mktemp /tmp/yast2-test.XXXXXX`" + cat >"$file" + if [ -z "$Y2TESTSUITE" ]; then + # errors are OK if they come from YCP (or Perl, #41448), + # mark them for output + sed1="s/ <[2-5]> [^ ]\+ \[$YCP\|Perl$\] $[^ ]\+$ / <0> host [YCP] \2 ${DUMMY_LOG_STRING}Log /" + # leave only essential info + sed2="s/^.*$DUMMY_LOG_STRING//g" + ycp="\[YCP\].*$DUMMY_LOG_STRING" + components="(agent-dummy|YCP)" + cat "$file" | sed "$sed1" | grep -E "<[012]>[^]]*$components.*$regex.*$DUMMY_LOG_STRING" | sed "$sed2" # | cut -d" " -f7- + # Y2PMrc: #38235 + cat "$file" | grep "<[345]>" | grep -v "\[$YCP\|Perl\|Y2PMrc$\]" >&2 + else + echo "Y2TESTSUITE set to \"$Y2TESTSUITE\"" + echo + cat "$file" + fi + rm -f "$file" +} + +( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" + +retcode="$PIPESTATUS" +if [ "$retcode" -gt 0 ]; then + if [ "$retcode" -ge 128 ]; then + sig=$[$retcode-128] + echo -ne "\nCommand terminated on signal '$sig'" + echo -e '!\n' + else + echo -e "\nReturn code: '$retcode'.\n" + fi +fi + +exit "$retcode" +# EOF Added: trunk/storage/storage/src/testsuite/tests/proposal1.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== (empty) Added: trunk/storage/storage/src/testsuite/tests/proposal1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== (empty) Added: trunk/storage/storage/src/testsuite/tests/proposal1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/proposal1.ycp (added) +++ trunk/storage/storage/src/testsuite/tests/proposal1.ycp Mon Dec 7 16:45:41 2009 @@ -0,0 +1,60 @@ +{ + include "testsuite.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" : [], + ], + ]; + + TESTSUITE_INIT([READ, $[], READ], nil); + + + import "Storage"; + import "StorageProposal"; + + 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(); + + DUMP("Proposal:"); + foreach(map info, infos, { + string text = info["text"]:""; + if (info["destructive"]:false) + text = text + " [destructive]"; + DUMP(text); + }); + } + else + { + DUMP("No proposal."); + } +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59983 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: aschnell Date: Mon Dec 7 16:35:46 2009 New Revision: 59983 URL: http://svn.opensuse.org/viewcvs/yast?rev=59983&view=rev Log: - take all containers from libstorage in testmode Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Dec 7 16:35:46 2009 @@ -3082,7 +3082,15 @@ map<string,map> tmp = $[]; boolean changed = false; - if( !probe_done && !Mode::config() ) + + if (Mode::test()) + { + foreach(map c, conts, { + tmp[c["device"]:""] = getContainerInfo(c); + }); + StorageMap[targets_key] = tmp; + } + else if( !probe_done && !Mode::config() ) { map<string,string> bios_id_raid = $[]; y2milestone ("probing StorageDevices" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59982 - in /trunk/network: package/yast2-network.changes src/lan/help.ycp src/modules/Lan.ycp src/modules/Routing.ycp
by kmachalkova＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: kmachalkova Date: Mon Dec 7 16:28:12 2009 New Revision: 59982 URL: http://svn.opensuse.org/viewcvs/yast?rev=59982&view=rev Log: ip_forwarding fix (bnc#474304) (merge from SP1 branch) Modified: trunk/network/package/yast2-network.changes trunk/network/src/lan/help.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/Routing.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Dec 7 16:28:12 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Dec 7 16:18:51 CET 2009 - kmachalkova(a)suse.cz + +- With enabled SuSEFirewall, set SuSEFirewall's FW_ROUTE variable + when enabling/disabling IP forwarding in routing settings. This + avoids overwriting sysctl variables by SuSEFirewall init scripts + (bnc#474304) + +------------------------------------------------------------------- Tue Dec 1 11:24:25 CET 2009 - mzugec(a)suse.de - ISDN: fixed creating configuration with incorrect name (bnc#534504) Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=599… ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Mon Dec 7 16:28:12 2009 @@ -75,10 +75,16 @@ _("For each route, enter destination network IP address, gateway address, and netmask. To omit any of these values, use dash sign \"-\". Select -the device through which the traffic to the defined network will be routed, as well.\"-\" is an alias for any interface. +the device through which the traffic to the defined network will be routed, +as well.\"-\" is an alias for any interface. ") + /* Routing dialog help 2/2 */ -_("Enable IP Forwarding if the system is a router. This will apply on both IPv4 and IPv6."), +_("Enable IP Forwarding (forwarding packets from external networks +to the internal one) if this system is a router. Both IPv4 and IPv6 connectivity +will be affected by this setting. +Important: if the firewall is enabled, allowing IP forwarding alone is not enough. +You should enable masquerade and/or set at least one redirect rule in firewall. You may +use YaST firewall module for that."), "dhcp_hostname": _("If you are using DHCP to get an IP address, check whether you get Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Dec 7 16:28:12 2009 @@ -188,13 +188,13 @@ /* Progress stage 4/9 */ _("Read network configuration"), /* Progress stage 5/9 */ - _("Read routing configuration"), + _("Read firewall settings"), /* Progress stage 6/9 */ _("Read hostname and DNS configuration"), /* Progress stage 7/9 */ _("Read installation information"), /* Progress stage 8/9 */ - _("Read firewall settings"), + _("Read routing configuration"), /* Progress stage 9/9 */ _("Detect current status"), ], [], ""); @@ -254,8 +254,10 @@ if(Abort()) return false; /* Progress step 5/9 */ - ProgressNextStage(_("Reading routing configuration...")); - Routing::Read(); + ProgressNextStage(_("Reading firewall settings...")); + boolean orig = Progress::set (false); + SuSEFirewall4Network::Read (); + Progress::set (orig); sleep(sl); if(Abort()) return false; @@ -273,10 +275,8 @@ if(Abort()) return false; /* Progress step 8/9 */ - ProgressNextStage(_("Reading firewall settings...")); - boolean orig = Progress::set (false); - SuSEFirewall4Network::Read (); - Progress::set (orig); + ProgressNextStage(_("Reading routing configuration...")); + Routing::Read(); sleep(sl); if(Abort()) return false; @@ -452,7 +452,7 @@ if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); y2internal("virt_net_proposal %1", virt_net_proposal); - if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { + if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { UI::OpenDialog(`opt(`decorated), `HBox( `HSpacing(1), `HCenter(`HSquash(`VBox( Modified: trunk/network/src/modules/Routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Routing.ycp?… ============================================================================== --- trunk/network/src/modules/Routing.ycp (original) +++ trunk/network/src/modules/Routing.ycp Mon Dec 7 16:28:12 2009 @@ -18,6 +18,7 @@ import "NetHwDetection"; import "NetworkInterfaces"; import "Map"; +import "SuSEFirewall"; include "network/runtime.ycp"; include "network/routines.ycp"; @@ -91,6 +92,30 @@ Routes = route; } +void ReadIPForwarding() { + if ( SuSEFirewall::IsEnabled() ){ + Forward = SuSEFirewall::GetSupportRoute(); + } + else { + Forward = (SCR::Read(.sysconfig.sysctl.IP_FORWARD) == "yes"); + } +} + +void WriteIPForwarding() { + if ( SuSEFirewall::IsEnabled() ){ + SuSEFirewall::SetSupportRoute( Forward ); + } + else { + SCR::Write(.sysconfig.sysctl.IP_FORWARD, Forward ? "yes" : "no"); + SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, Forward ? "yes" : "no"); + SCR::Write(.sysconfig.sysctl, nil); + } + SCR::Execute(.target.bash, sformat("echo %1 > /proc/sys/net/ipv4/ip_forward", + Forward ? 1 : 0)); + SCR::Execute(.target.bash, sformat("echo %1 > /proc/sys/net/ipv6/conf/all/forwarding", + Forward ? 1 : 0)); + +} /** * Read routing settings @@ -105,9 +130,7 @@ else Routes = []; - /* enabled IP forwarding */ - if(SCR::Read(.sysconfig.sysctl.IP_FORWARD) == "yes") - Forward = true; + ReadIPForwarding(); y2debug("Routes=%1", Routes); y2debug("Forward=%1", Forward); @@ -154,18 +177,7 @@ /*Progress stage 1/2*/ ProgressNextStage(_("Writing IP forwarding settings...")); - if(Forward) { - SCR::Write(.sysconfig.sysctl.IP_FORWARD, "yes"); - SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, "yes"); - SCR::Execute(.target.bash, "echo 1 > /proc/sys/net/ipv4/ip_forward"); - SCR::Execute(.target.bash, "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding"); - } - else { - SCR::Write(.sysconfig.sysctl.IP_FORWARD, "no"); - SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, "no"); - SCR::Execute(.target.bash, "echo 0 > /proc/sys/net/ipv4/ip_forward"); - SCR::Execute(.target.bash, "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding"); - } + WriteIPForwarding(); sleep(sl); /* at first stop the running routes */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59981 - /branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes
by tgoettlicher＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: tgoettlicher Date: Mon Dec 7 15:59:52 2009 New Revision: 59981 URL: http://svn.opensuse.org/viewcvs/yast?rev=59981&view=rev Log: fixed typo Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes Mon Dec 7 15:59:52 2009 @@ -222,7 +222,7 @@ ------------------------------------------------------------------- Fri Jan 9 18:52:44 CET 2009 - sh(a)suse.de -- Fixed accmulated margins in "Versions" view for installed +- Fixed accumulated margins in "Versions" view for installed ------------------------------------------------------------------- Fri Jan 9 17:59:43 CET 2009 - sh(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0