Author: lslezak Date: Fri Nov 25 18:47:22 2011 New Revision: 66961 URL: http://svn.opensuse.org/viewcvs/yast?rev=66961&view=rev Log: - fixed registration status check when there is only one product installed (bnc#732813) - 2.17.27 - added tests Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.err branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/VERSION?rev=66961&r1=66960&r2=66961&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/VERSION Fri Nov 25 18:47:22 2011 @@ -1 +1 @@ -2.17.26 +2.17.27 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes?rev=66961&r1=66960&r2=66961&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Fri Nov 25 18:47:22 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 25 16:15:24 UTC 2011 - lslezak@suse.cz + +- fixed registration status check when there is only one product + installed (bnc#732813) +- 2.17.27 + +------------------------------------------------------------------- Thu Nov 3 15:55:33 UTC 2011 - lslezak@suse.cz - display "Registration Code" checkbox in the registration step Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp?rev=66961&r1=66960&r2=66961&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Fri Nov 25 18:47:22 2011 @@ -861,7 +861,9 @@ map status = RegistrationStatus::ReadFile(file); timestamp = tointeger(status["generated"]:"-1"); - list<map> products = status["productstatus"]:[]; + + any read_products = status["productstatus"]:nil; + list<map> products = is(read_products, map) ? [ (map)read_products ] : (list<map>)read_products; // check each product foreach(map product, products, Modified: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am?rev=66961&r1=66960&r2=66961&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am Fri Nov 25 18:47:22 2011 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.xml) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.err?rev=66961&view=auto ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out?rev=66961&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out Fri Nov 25 18:47:22 2011 @@ -0,0 +1,21 @@ +Read .target.tmpdir "/tmp" +Read .target.stat "/y2update/control.xml" $["isreg":true] +Read .target.size "/y2update/control.xml" 1 +Read .xml "/y2update/control.xml" $[] +Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" +Execute .target.bash_output "locale -k charmap" $["exit":0, "stdout":"charmap=\"UTF-8\"\n"] +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .target.size "/etc/sysconfig/language" 1 +Read .sysconfig.language.ROOT_USES_LANG "ctype" +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .sysconfig.language.INSTALLED_LANGUAGES "" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.size "tests/registration-1product.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-2products.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES", "sle-slms"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-expired.xml" 1 +Return $["expired":["sle-slms"], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-error.xml" 1 +Return $["expired":[], "failed":["SUSE_SLES", "sle-slms"], "no_subscription":[], "provisional":[], "registered":[], "registered_system":true, "rma":[], "timestamp":1279715826] Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp?rev=66961&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp Fri Nov 25 18:47:22 2011 @@ -0,0 +1,57 @@ +/** + * Testsuite for Wagon.ycp module + * + */ + +{ + +include "testsuite.ycp"; + +// huh, we need to mock too much paths because of some module constructor... :-( +map READ = $[ + "target" : $[ + "tmpdir" : "/tmp", + "size" : 1, + "stat" : $["isreg": true], + "string" : "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" + ], + "xml" : $[], + "sysconfig" : $[ + "language" : $[ + "RC_LANG" : "en_US.UTF-8", + "ROOT_USES_LANG" : "ctype", + "RC_LANG" : "en_US.UTF-8", + "INSTALLED_LANGUAGES" : "" + ], + "console" : $[ + "CONSOLE_ENCODING" : "UTF-8" + ] + ] +]; + +map EXEC = $[ + "target" : $[ + "bash_output" : $[ "exit" : 0, "stdout" : "charmap=\"UTF-8\"\n"] + ] +]; + +TESTSUITE_INIT ([READ, $[], EXEC], nil); + +import "Wagon"; + +// check parsing registration status file + +// one registered product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-1product.xml")), [[READ], [], []], 0); + +// two registered products +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-2products.xml")), [[READ], [], []], 0); + +// one expired product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-expired.xml")), [[READ], [], []], 0); + +// failed registration +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-error.xml")), [[READ], [], []], 0); + + +} Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml?rev=66961&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml?rev=66961&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml?rev=66961&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1279715826"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Linux Enterprise Server 11 SP1 was provided.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Lifecycle Management Server 1.0 was provided.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml?rev=66961&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_SUB_EXP"> + <subscription status="EXPIRED" expiration="1280302484" type="EVALUATION"/> + <message>The subscription for SUSE Lifecycle Management Server 1.0 is expired.</message> + </productstatus> +</status> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org