December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60152 - in /trunk/printer/src: connectionwizard.ycp helps.ycp overview.ycp
by jsmeix＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: jsmeix Date: Fri Dec 18 14:43:50 2009 New Revision: 60152 URL: http://svn.opensuse.org/viewcvs/yast?rev=60152&view=rev Log: I was almost toast in the encoding hell but it seems now the percent encoding stuff works, see bnc#561626 Modified: trunk/printer/src/connectionwizard.ycp trunk/printer/src/helps.ycp trunk/printer/src/overview.ycp Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Fri Dec 18 14:43:50 2009 @@ -43,88 +43,218 @@ string connection_uri=""; string connection_model=""; -// Map of reserved URI characters ! # $ % & ' ( ) * + , / : ; = ? @ [ ] -// plus the space character and their matching percent encoding +// List of reserved URI characters ! # $ % & ' ( ) * + , / : ; = ? @ [ ] +// (the % character is separated as percentage_percent_encoding) +// plus the space character and their matching percent encodings // where each percent encoding must be exactly three characters -// and uppercase letters, otherwise URIpercentDecoding will not work: -map< string, string > uri_percent_encodings = $[ " ":"%20", - "!":"%21", - "#":"%23", - "$":"%24", - "&":"%26", - "'":"%27", - "(":"%28", - ")":"%29", - "*":"%2A", - "+":"%2B", - ",":"%2C", - "/":"%2F", - ":":"%3A", - ";":"%3B", - "=":"%3D", - "?":"%3F", - "@":"%40", - "[":"%5B", - "]":"%5D" - ]; +// and uppercase letters, otherwise URIpercentDecoding would not work. +// It is crucial to have "%":"%25" first so that URIpercentEncoding works correctly +// because "%" must be replaced by "%25" first of all otherwise +// a duplicate encoding would happen "Foo Bar" -> "Foo%20Bar" -> "Foo%2520Bar" +// but only "Foo Bar" -> "Foo%20Bar" would be the correct encoding. +// It is crucial to have "%":"%25" last so that URIpercentDecoding works correctly +// because "%25" must be replaced by "%" last otherwise +// a duplicate dencoding would happen: "Foo%2520Bar" -> "Foo%20Bar" -> "Foo Bar". +// but only "Foo%2520Bar" -> "Foo%20Bar" would be the correct dencoding. +// Therefore "%":"%25" cannot be at all in this list but is +// separated as percentage_percent_encoding which is +// prepended to this list so that URIpercentEncoding works correctly and +// appended to this list so that URIpercentDecoding works correctly. +// Unfortunately a simple map like $[ "%":"%25", " ":"%20", ... ] +// does not work because in a map the ordering is not kept +// even when there is no operation which changes the map +// the internal ordering in a map is different +// from how it was specified here. +// It seems the internal ordering in a map is alphabetically sorted +// so that $[ "%":"%25", " ":"%20", ... ] -> $[ " ":"%20", ... "%":"%25", ... ] +// Therefore a list is used which keeps the initial ordering. +list< map< string, string > > uri_percent_encodings = [ $[ "character":" ", + "encoding":"%20" + ], + $[ "character":"!", + "encoding":"%21" + ], + $[ "character":"#", + "encoding":"%23" + ], + $[ "character":"$", + "encoding":"%24" + ], + $[ "character":"&", + "encoding":"%26" + ], + $[ "character":"'", + "encoding":"%27" + ], + $[ "character":"(", + "encoding":"%28" + ], + $[ "character":")", + "encoding":"%29" + ], + $[ "character":"*", + "encoding":"%2A" + ], + $[ "character":"+", + "encoding":"%2B" + ], + $[ "character":",", + "encoding":"%2C" + ], + $[ "character":"/", + "encoding":"%2F" + ], + $[ "character":":", + "encoding":"%3A" + ], + $[ "character":";", + "encoding":"%3B" + ], + $[ "character":"=", + "encoding":"%3D" + ], + $[ "character":"?", + "encoding":"%3F" + ], + $[ "character":"@", + "encoding":"%40" + ], + $[ "character":"[", + "encoding":"%5B" + ], + $[ "character":"]", + "encoding":"%5D" + ] + ]; +map< string, string > percentage_percent_encoding = $[ "character":"%", + "encoding":"%25" + ]; string URIpercentEncoding( string input ) -{ // Replace space and each reserved character ! # $ % & ' ( ) * + , / : ; = ? @ [ ] - // in a value (component) of an URI with its percent encoding, see - // https://bugzilla.novell.com/show_bug.cgi?id=512549 - // This function is only meant as "some kind of automated fix" - // when the user entered URI values but forgot to do percent encoding. - // The help text in the Connection Wizard dilaog explicitely demands - // that URI values (components) must be entered with percent encoding. - // This function can only be used for percent encoding for a single URI component. +{ // Unfortunately URL::EscapeString(input,URL::transform_map_passwd) + // cannot be used because URL::transform_map_passwd is insufficient because + // the characters ! # ' ( ) * [ ] are missing in URL::transform_map_passwd. + // URIpercentEncoding replaces the space character and + // each reserved character ! # $ % & ' ( ) * + , / : ; = ? @ [ ] + // in a value (component) of an URI with its matching percent encoding, + // see https://bugzilla.novell.com/show_bug.cgi?id=512549 + // This function can only be used for percent encoding of the value + // of a single URI component where no character in the input + // is already percent encoded, otherwise e.g. "Foo%20Bar" results "Foo%2520Bar". // In particular this function cannot be used when the user can enter a whole URI // or the whole set of URI options (e.g. option1=value1&option2=value2). - // The '%' character itself would need a special handling because - // the input string is usually already percent encoded - // (in particular when the URI was retreived from CUPS) - // so that the '%' character could be only replaced by '%25' - // if not two hexadecimal digits '0123456789AaBbCcDdEeFf' follow - // but for now the '%' character is simply not replaced at all - // which is no big shortfall for a "some kind of automated fix" function. string output = input; - foreach( string reserved_character, - string percent_encoding, - uri_percent_encodings, - { output = mergestring( splitstring( output, reserved_character ), percent_encoding ); + foreach( map< string, string > current_encoding, + prepend( uri_percent_encodings, percentage_percent_encoding ), + { string character = current_encoding["character"]:""; + string encoding = current_encoding["encoding"]:""; + if( "" == character || "" == encoding ) + { continue; + } + output = mergestring( splitstring( output, character ), encoding ); } ); + y2milestone( "URIpercentEncoding from '%1' to '%2'", input, output ); return output; } string URIpercentDecoding( string input ) -{ // The opposite of the above URIpercentEncoding function so that - // URIpercentDecoding( URIpercentEncoding ( input ) ) == input +{ // Unfortunately URL::UnEscapeString(input,URL::transform_map_passwd) + // cannot be used because URL::transform_map_passwd is insufficient because + // the characters ! # ' ( ) * [ ] are missing in URL::transform_map_passwd + // and URL::UnEscapeString("Foo%2525Bar") results "Foo%Bar" which is wrong + // because URIpercentDecoding("Foo%2525Bar") results "Foo%25Bar". + // URIpercentDecoding is the opposite of the URIpercentEncoding function + // so that URIpercentDecoding(URIpercentEncoding(input)) == input string output = input; - foreach( string reserved_character, - string percent_encoding, - uri_percent_encodings, - { // Assume output = "Foo%2aBar%2aBaz" - integer position = search( output, percent_encoding ); - // position = nil = search( "Foo%2ABar%2ABaz", "%2A" ) - if( nil == position ) - { position = search( output, tolower( percent_encoding ) ); - // position = 3 = search( "Foo%2aBar%2aBaz", "%2a" ) + // Assume the input is "First%3aSecond%3AThird%2525Rest" + // Character positions: 0123456789012345678901234567890 + foreach( map< string, string > current_encoding, + add( uri_percent_encodings, percentage_percent_encoding ), + { string character = current_encoding["character"]:""; + string encoding = current_encoding["encoding"]:""; + if( "" == character || "" == encoding ) + { continue; + } + // Process the output of the previous foreach loop as rest_of_input + // and clear the output for the current foreach loop: + string rest_of_input = output; + output = ""; + integer position = search( rest_of_input, encoding ); + // For character = "%" and encoding = "%25" + // position = 22 = search( "First%3aSecond%3AThird%2525Rest", "%25" ) + // For character = ":" and encoding = "%3A" + // position = 14 = search( "First%3aSecond%3AThird%25Rest", "%3A" ) + integer position_lowercase = search( rest_of_input, tolower( encoding ) ); + // For character = "%" and encoding = "%25" + // position_lowercase = 22 = search( "First%3aSecond%3AThird%2525Rest", "%25" ) + // For character = ":" and actual percent encoding = "%3a" + // position = 5 = search( "First%3aSecond%3AThird%25Rest", "%3a" ) + if( ( position != nil && position_lowercase != nil && position_lowercase < position ) + || ( position == nil && position_lowercase != nil ) + ) + { position = position_lowercase; + // For character = ":" and actual percent encoding = "%3a" + // position = 5 } + // For character = "%" and encoding = "%25" + // position = 22 while( position != nil ) - { // Each percent encoding is exactly three characters so that + { // Each percent encoding is exactly three characters long so that // the first position characters are those up to the current percent encoding // and at position + 3 the rest after the current percent encoding starts: - output = substring( output, 0, position ) + reserved_character + substring( output, position + 3 ); - // output = "Foo*Bar%2aBaz" = "Foo" + "*" + "Bar%2aBaz" - position = search( output, percent_encoding ); - // position = nil = search( "Foo*Bar%2aBaz", "%2A" ) - if( nil == position ) - { position = search( output, tolower( percent_encoding ) ); - // position = 7 = search( "Foo*Bar%2aBaz", "%2a" ) + string characters_up_to_current_encoding = substring( rest_of_input, 0, position ); + output = output + characters_up_to_current_encoding + character; + // For character = "%" and encoding = "%25" + // output = "First%3aSecond%3AThird%" = "" + "First%3aSecond%3AThird" + "%" + // For character = ":" and actual percent encoding = "%3a" + // output = "First:" = "" + "First" + ":" + // For character = ":" and encoding = "%3A" + // output = "First:Second:" = "First:" + "Second" + ":" + rest_of_input = substring( rest_of_input, position + 3 ); + // For character = "%" and encoding = "%25" + // rest_of_input = "25Rest" + // For character = ":" and actual percent encoding = "%3a" + // rest_of_input = "Second%3AThird%25Rest" + // For character = ":" and encoding = "%3A" + // rest_of_input = "Third%25Rest" + position = search( rest_of_input, encoding ); + // For character = "%" and encoding = "%25" + // position = nil = search( "25Rest", "%25" ) + // For character = ":" and encoding = "%3A" + // position = 6 = search( "Second%3AThird%25Rest", "%3A" ) + // For second while loop for character = ":" and encoding = "%3A" + // position = nil = search( "Third%25Rest", "%3A" ) + position_lowercase = search( rest_of_input, tolower( encoding ) ); + // For character = "%" and encoding = "%25" + // position_lowercase = nil = search( "25Rest", "%25" ) + // For character = ":" and actual percent encoding = "%3a" + // position = nil = search( "Second%3AThird%25Rest", "%3a" ) + // For second while loop for character = ":" and actual percent encoding = "%3a" + // position = nil = search( "Third%25Rest", "%3a" ) + if( ( position != nil && position_lowercase != nil && position_lowercase < position ) + || ( position == nil && position_lowercase != nil ) + ) + { position = position_lowercase; } + // For character = "%" and encoding = "%25" + // position = nil + // For character = ":" and encoding = "%3A" + // position = 6 + // For second while loop for character = ":" and encoding = "%3A" + // position = nil } + // After replacing all occurrences of the current percent encoding + // by its character append what is left as rest of the input: + output = output + rest_of_input; + // For character = "%" and encoding = "%25" + // output = "First%3aSecond%3AThird%25Rest" + // For character = ":" and encoding = "%3A" + // output = "First:Second:Third%25Rest" } ); + // output = "First:Second:Third%25Rest" + y2milestone( "URIpercentDecoding from '%1' to '%2'", input, output ); return output; } @@ -361,14 +491,26 @@ } term getNetworkContent( string hostname, string scan_hosts_label, string port_or_queue_label, string port_or_queue, string uri_options ) -{ term content = `VBox +{ // TRANSLATORS: Text entry to fill IP or hostname of remote server + string hostname_label = _("&IP Address or Host Name"); + // No URIpercentDecoding/Encondin(hostname) is done + // when it contains a '@' because a lpd URI can be of the form + // lpd://username@ip-address-or-hostname/... + // and a ipp/http URI can be of the form + // ipp://username:password@ip-address-or-hostname/... + // http://username:password@ip-address-or-hostname/... + // see https://bugzilla.novell.com/show_bug.cgi?id=512549 + if( issubstring( hostname, "@" ) ) + { // TRANSLATORS: Text entry to fill IP or hostname of remote server + hostname_label = _("&IP Address or Host Name [percent-encoded]"); + } + term content = `VBox ( `Left ( `HBox ( `ComboBox ( `id(`hostname), `opt(`editable), - // TRANSLATORS: Text entry to fill IP or hostname of remote server - _("&IP Address or Host Name"), + hostname_label, [ hostname ] ), `MenuButton @@ -390,7 +532,7 @@ // longer stuff like 'option1=value1&option2=value2': `opt(`hstretch), // TRANSLATORS: InputField for optional Device URI parameters: - _("Optional 'option=value' parameter (usually empty)"), + _("Optional 'option=value' parameter (usually empty) [percent-encoded]"), uri_options ) ), @@ -1064,13 +1206,13 @@ } } } - connection_content = getNetworkContent( hostname, + connection_content = getNetworkContent( URIpercentDecoding( hostname ), // TRANSLATORS: List of input field labels, // first for network scan button, // second for the TCP port number: _("Scan for Direct Socket Servers"), _("TCP Port Number"), - port_or_queue, + URIpercentDecoding( port_or_queue ), uri_options ); model_content = getContentFromCurrentModel( true ); @@ -1110,13 +1252,20 @@ } } } + if( ! issubstring( hostname, "@" ) ) + { // It would be wrong to do URIpercentDecoding(hostname) + // when it contains a '@' because a lpd URI can be of the form + // lpd://username@ip-address-or-hostname/... + // see https://bugzilla.novell.com/show_bug.cgi?id=512549 + hostname = URIpercentDecoding( hostname ); + } connection_content = getNetworkContent( hostname, // TRANSLATORS: List of input field labels, // first for network scan button, // second for name of printer queue _("Scan for LPD Servers"), _("Queue Name (see the printer's manual)"), - port_or_queue, + URIpercentDecoding( port_or_queue ), uri_options ); model_content = getContentFromCurrentModel( true ); @@ -1165,7 +1314,7 @@ // longer stuff like 'ipp://ip-address:port-number/resource': `opt(`hstretch), // TRANSLATORS: Input field label - _("URI (see the printer's manual)"), + _("URI (see the printer's manual) [percent-encoded]"), uri ) ), @@ -1262,7 +1411,7 @@ `opt(`editable), // TRANSLATORS: Text entry for remote server name _("Server (NetBIOS Host Name)"), - [ hostname ] + [ URIpercentDecoding( hostname ) ] //), //`MenuButton //( // TRANSLATORS: Label for menu to search for remote servers @@ -1279,7 +1428,7 @@ ( `id(`printer), // TRANSLATORS: Text entry for printer name _("Printer (Share Name)"), - printer + URIpercentDecoding( printer ) ) ), `Left @@ -1289,7 +1438,7 @@ `opt(`editable), // TRANSLATORS: Text entry for samba domain _("Workgroup (Domain Name)"), - [ domain ] + [ URIpercentDecoding( domain ) ] //), //PushButton //( `id(`scan_domain), @@ -1307,13 +1456,13 @@ ( `id(`user), // TRANSLATORS: Text entry for username (authentication) _("User"), - user + URIpercentDecoding( user ) ), `Password ( `id(`pass), // TRANSLATORS: Text entry for password (authentication) _("&Password"), - pass + URIpercentDecoding( pass ) ) ) ) @@ -1362,13 +1511,20 @@ } } } + if( ! issubstring( hostname, "@" ) ) + { // It would be wrong to do URIpercentDecoding(hostname) + // when it contains a '@' because a lpd URI can be of the form + // lpd://username@ip-address-or-hostname/... + // see https://bugzilla.novell.com/show_bug.cgi?id=512549 + hostname = URIpercentDecoding( hostname ); + } connection_content = getNetworkContent( hostname, // TRANSLATORS: List of input field labels, // first for network scan button, // second for name of printer queue _("Scan for LPD Servers"), _("Queue Name"), - port_or_queue, + URIpercentDecoding( port_or_queue ), uri_options ); model_content = getContentFromCurrentModel( false ); @@ -1427,6 +1583,18 @@ } } } + // TRANSLATORS: Text entry to fill IP or hostname of remote server + string hostname_label = _("&IP Address or Host Name [percent-encoded]"); + if( ! issubstring( hostname, "@" ) ) + { // It would be wrong to do URIpercentDecoding(hostname) + // when it contains a '@' because a ipp/http URI can be of the form + // ipp://username:password@ip-address-or-hostname/... + // http://username:password@ip-address-or-hostname/... + // see https://bugzilla.novell.com/show_bug.cgi?id=512549 + hostname = URIpercentDecoding( hostname ); + // TRANSLATORS: Text entry to fill IP or hostname of remote server + hostname_label = _("&IP Address or Host Name"); + } model_content = getContentFromCurrentModel( false ); content = `VBox ( `Left @@ -1434,8 +1602,7 @@ ( `ComboBox ( `id(`hostname), `opt(`editable), - // TRANSLATORS: Text entry for IP or hostname of remote server - _("IP Address or Host Name"), + hostname_label, [ hostname ] ), `MenuButton @@ -1450,7 +1617,7 @@ ), `Left ( // TRANSLATORS: InputField for a print queue name: - `InputField( `id(`queue), _("Queue Name"), queue ) + `InputField( `id(`queue), _("Queue Name"), URIpercentDecoding( queue ) ) ), `Left ( `InputField( `id(`uri_options), @@ -1458,7 +1625,7 @@ // longer stuff like 'option1=value1&option2=value2': `opt(`hstretch), // TRANSLATORS: InputField for optional Device URI parameters: - _("Optional 'option=value' parameter (usually empty)"), + _("Optional 'option=value' parameter (usually empty) [percent-encoded]"), uri_options ) ), @@ -1627,7 +1794,7 @@ // longer stuff like 'scheme://server:port/path/to/resource': `opt(`hstretch), // TRANSLATORS: Text entry for URI (Uniform Resource Identifier) - _("URI (Uniform Resource Identifier)"), + _("URI (Uniform Resource Identifier) [percent-encoded]"), current_device_uri ) ), @@ -1669,7 +1836,7 @@ // longer stuff like 'path/to/command?option1=value1&option2=value2': `opt(`hstretch), // TRANSLATORS: Text entry for program name that will be called via pipe: - _("Program (/path/to/command?option=value)"), + _("Program (/path/to/command?option=value) [percent-encoded]"), uri ) ), @@ -1749,7 +1916,7 @@ // longer stuff like 'scheme://server:port/path/to/resource': `opt(`hstretch), // TRANSLATORS: Text entry for device URI (Uniform Resource Identifier) - _("Device URI (for which 'beh' should be applied)"), + _("Device URI (for which 'beh' should be applied) [percent-encoded]"), uri ) ), @@ -2482,8 +2649,8 @@ string password = ""; switch(selected) { case(`tcp): - host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); - port = URIpercentDecoding( (string)UI::QueryWidget( `port_or_queue, `Value ) ); + host = (string)UI::QueryWidget( `hostname, `Value ); + port = (string)UI::QueryWidget( `port_or_queue, `Value ); test_command = sformat( "%1test_remote_socket \"%2\" \"%3\" %4", Printerlib::yast_bin_dir, host, @@ -2505,8 +2672,8 @@ break; case(`lpd): case(`lpr): - host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); - queue = URIpercentDecoding( (string)UI::QueryWidget( `port_or_queue, `Value ) ); + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `port_or_queue, `Value ); port = "515"; test_command = sformat( "%1test_remote_lpd \"%2\" \"%3\" %4", Printerlib::yast_bin_dir, @@ -2528,8 +2695,8 @@ } break; case(`cups): - host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); - queue = URIpercentDecoding( (string)UI::QueryWidget( `queue, `Value ) ); + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `queue, `Value ); test_command = sformat( "%1test_remote_ipp \"%2\" \"%3\" %4", Printerlib::yast_bin_dir, host, @@ -2550,11 +2717,11 @@ } break; case(`smb): - host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); - queue = URIpercentDecoding( (string)UI::QueryWidget( `printer, `Value ) ); - workgroup = URIpercentDecoding( (string)UI::QueryWidget( `domain, `Value ) ); - user = URIpercentDecoding( (string)UI::QueryWidget( `user, `Value ) ); - password = URIpercentDecoding( (string)UI::QueryWidget( `pass, `Value ) ); + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `printer, `Value ); + workgroup = (string)UI::QueryWidget( `domain, `Value ); + user = (string)UI::QueryWidget( `user, `Value ); + password = (string)UI::QueryWidget( `pass, `Value ); test_command = sformat( "%1test_remote_smb \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" %7", Printerlib::yast_bin_dir, workgroup, @@ -2578,10 +2745,10 @@ } break; case(`ipx): - host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); - queue = URIpercentDecoding( (string)UI::QueryWidget( `queue, `Value ) ); - user = URIpercentDecoding( (string)UI::QueryWidget( `user, `Value ) ); - password = URIpercentDecoding( (string)UI::QueryWidget( `pass, `Value ) ); + host = (string)UI::QueryWidget( `hostname, `Value ); + queue = (string)UI::QueryWidget( `queue, `Value ); + user = (string)UI::QueryWidget( `user, `Value ); + password = (string)UI::QueryWidget( `pass, `Value ); test_command = sformat( "%1test_remote_novell \"%2\" \"%3\" \"%4\" \"%5\" %6", Printerlib::yast_bin_dir, host, @@ -2622,24 +2789,23 @@ // (in contrast duplicate URIs in the Printer::queues list are perfectly o.k.) // but if duplicate URIs exist in Printer::connections, all those entries are updated. boolean uri_already_exists = false; -/* - // I do not know if it is allowed to modify one same list "in place" via foreach: - integer connections_index = -1; - foreach( map< string, string > connection_entry, - Printer::connections, - { // Set the connections_index to the index number of the current connection_entry: - connections_index = connections_index + 1; - // If the URI already exists, update its matching entry in the Printer::connections list: - if( connection_uri == connection_entry["uri"]:"" ) - { uri_already_exists = true; - y2internal( "UpdateConnectionsList: modify connections list type '%1' with uri '%2' for model '%3'", selected, connection_uri, connection_model ); - Printer::connections[connections_index,"model"] = connection_model; - // Leave te values for deviceID, info, and class unchanged because when the URI is the same - // those values still match to the URI and therefore should also stay the same. - } - } - ); -*/ + // I do not know if it is allowed to modify one same list "in place" via foreach like: + // list < string > words = [ "Jane", "World", "John" ]; + // integer index = -1; + // foreach( string word, + // words, + // { index = index + 1; + // if( "World" == word ) + // { words[index] = "Hello " + word; + // } + // } + // ); + // so that in any case the result words == [ "Jane", "Hello World", "John" ] + // and therefore I prefer to be on the safe side with maplist + // which might consume unnecessarily much memory and CPU + // (maplist has two lists and all elements are at least copied + // instead of "in place" modification only where needed via foreach) + // but for my small lists this does actually not matter: Printer::connections = maplist( map< string, string > connection_entry, Printer::connections, { if( connection_uri == connection_entry["uri"]:"" ) Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=60152&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Fri Dec 18 14:43:50 2009 @@ -364,31 +364,93 @@ </p>"), "connection_wizard_dialog" : -// ConnectionWizardDialog help 1/6: +// ConnectionWizardDialog help 1/7: _("<p> <b><big>Specify the Connection</big></b><br> The <b>connection</b> determines which way data is sent to the printer device.<br> If a wrong connection is used, no data can be sent to the device so that there cannot be any printout. </p>") + -// ConnectionWizardDialog help 2/6: +// ConnectionWizardDialog help 2/7: _("<p> <b><big>Printer Device URI</big></b><br> A connection is specified as so called <b>device URI</b>.<br> Its first word (the so called URI scheme) specifies the kind of data-transfer, for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'.<br> -After the scheme there are more or less additional parts +After the scheme there are more or less additional components which specify the details for this kind of data-transfer.<br> -The parts of an URI are separated by special reserved characters like +Space characters are not allowed in an URI. +Therefore a space character in a value of an URI component +is encoded as '%20' (20 is the hexadecimal value of the space character).<br> +The components of an URI are separated by special reserved characters like colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br> Finally there could be optional parameters (separated by a question mark '?') -of the form option1=value1&option2=value2&option3=value3 so that +of the form 'option1=value1&option2=value2&option3=value3' so that a full device URI could be for example:<br> ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br> -Reserved characters inside of a part of the URI must be percent-encoded -(also known as URL encoding). -In particular a space character ' ' must be written as '%20'.<br> -Here a list of the reserved characters and their percent encoding:<br> +Some examples:<br> +A USB printer model 'Fun Printer 1000+' made by 'ACME' +with serial number 'A1B2C3' may have a device URI like:<br> +usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br> +A network printer with IP 192.168.100.1 which is accessible +via port 9100 may have a device URI like:<br> +socket://192.168.100.1:9100<br> +A network printer with IP 192.168.100.2 which is accessible +via LPD protocol with a remote LPD queue name 'LPT1' +may have a device URI like:<br> +lpd://192.168.100.2/LPT1 +</p>") + +// ConnectionWizardDialog help 3/7: +_("<p> +<b><big>Percent Encoding</big></b><br> +The issue is complicated. +It is recommended to avoid reserved characters and spaces +for component values in URIs if the values are under your control +(e.g. you cannot avoid it when you must specify such characters +in values for an URI to access a remote print queue +but the remote print queue is not under your control). +Whenever possible use only so called 'unreserved characters'. +Unreserved characters are uppercase and lowercase letters, +decimal digits, hyphen, period, underscore, and tilde. +Even hyphen, period, tilde, and case sensitivity +could cause special issues in special cases +(e.g. only letters, digits, and underscore are known to work +for a CUPS print queue name and case is not significant there). +Therefore it is best to use only lowercase letters, digits, +and underscore for all values in all URIs if possible.<br> +Reserved characters and space characters in the value of a component +must be percent-encoded (also known as URL encoding).<br> +When an input field in the dialog is intended to enter +only a single value for a single component of the URI +(e.g. separated input fields for username and password), +you must enter spaces and reserved characters literally +(i.e. non-percent-encoded). +For such input fields all spaces and reserved characters +will be automatically percent-encoded. +For example if a password is actually 'Foo%20Bar' (non-percent-encoded), +it must be entered literally in the password input field in the dialog. +The automated percent-encoding results 'Foo%2520Bar' which is how +the vaule of the password component is actually stored in the URI.<br> +In contrast when an input field in the dialog is intended to enter +more that a single value for a single component of the URI +(e.g. a single input field for all optional parameters +like 'option1=value1&option2=value2&option3=value3' +or a single input field to enter the whole URI), +you must enter spaces and reserved characters percent-encoded +because an automated percent-encoding is no longer possible. +Assume in an optional parameter 'option=value' +the value would be 'this&that' so that the whole +optional parameter would be 'option=this&that' (literally). +But a literal '&' character denotes +the separation of different optional parameters +so that 'option=this&that' in an URI means +a first optional parameter 'option=this' and +a second optional parameter which is only 'that'. +Therefore a single optional parameter 'option=this&that' +must be entered percent-encoded as 'option=this%26that'<br> +Input fields which require percent-encoded input +are denoted by a '[percent-encoded]' hint.<br> +Listing of characters and their percent encoding:<br> space ' ' -> %20<br> exclamation mark ! -> %21<br> number sign # -> %23<br> @@ -411,19 +473,8 @@ right bracket ] -> %5D<br> For details see 'Uniform Resource Identifier (URI): Generic Syntax' at<br> http://tools.ietf.org/html/rfc3986<br> -Some examples:<br> -A USB printer model 'Fun Printer 1000+' made by 'ACME' -with serial number 'A1B2C3' may have a device URI like:<br> -usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br> -A network printer with IP 192.168.100.1 which is accessible -via port 9100 may have a device URI like:<br> -socket://192.168.100.1:9100<br> -A network printer with IP 192.168.100.2 which is accessible -via LPD protocol with a remote LPD queue name 'LPT1' -may have a device URI like:<br> -lpd://192.168.100.2/LPT1 </p>") + -// ConnectionWizardDialog help 3/6: +// ConnectionWizardDialog help 4/7: _("<p> <b><big>Device URIs for Directly Connected Devices</big></b><br> Devices which are connected via the parallel port or via USB @@ -452,7 +503,7 @@ The package provides the CUPS backend 'bluetooth' which actually sends the data to a bluetooth printer. </p>") + -// ConnectionWizardDialog help 4/6: +// ConnectionWizardDialog help 5/7: _("<p> <b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br> A printserver box is a small device with a network connection @@ -489,7 +540,7 @@ For <b>more information</b> have a look at<br> http://www.cups.org/documentation.php/network.html </p>") + -// ConnectionWizardDialog help 5/6: +// ConnectionWizardDialog help 6/7: _("<p> <b><big>Device URIs to Print Via a Print Server Machine</big></b><br> In contrast to a printserver box a print server machine @@ -543,7 +594,7 @@ For <b>more information</b> have a look at <tt>man nprint</tt> and the other documentation in the RPM package ncpfs. </p>") + -// ConnectionWizardDialog help 6/6: +// ConnectionWizardDialog help 7/7: _("<p> <b><big>Special Device URIs</big></b><br> <b>Specify an Arbitrary Device URI</b> Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=601… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Fri Dec 18 14:43:50 2009 @@ -351,13 +351,17 @@ // "Test" is disabled when there is no queue selected or no queue in the table // and when the queue state is not "ready" (i.e. when jobs are rejected and/or when printing is disabled). integer selected_queue_index = (integer)UI::QueryWidget( `id(`overview_table), `CurrentItem ); - // To be safe invalidate Printer::selected_queues_index, Printer::current_queue_name, - // and Printer::current_device_uri in any case by default and as fallback. + // To be safe invalidate Printer::selected_connections_index, Printer::current_device_uri, + // Printer::selected_queues_index, and Printer::current_queue_name in any case by default and as fallback. + // In particular invalidate Printer::selected_connections_index and Printer::selected_queues_index + // to let the getCurrentDeviceURI function in connectionwizard.ycp fail to avoid that + // the URI of a different previously preselected queue becomes preselected in the Connection Wizard. // The index of the currently selected queue is stored in selected_queue_index // which is used to re-enable those values later if appropriate conditions are met: + Printer::selected_connections_index = -1; + Printer::current_device_uri = ""; Printer::selected_queues_index = -1; Printer::current_queue_name = ""; - Printer::current_device_uri = ""; if( selected_queue_index == nil || selected_queue_index < 0 ) { // When no valid queue was selected, nothing can be tested or edited or deleted: UI::ChangeWidget( `test, `Enabled, false ); -- 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] r60151 - in /trunk/storage/storage/src/testsuite: lib/ tests/
by aschnell＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: aschnell Date: Fri Dec 18 14:43:22 2009 New Revision: 60151 URL: http://svn.opensuse.org/viewcvs/yast?rev=60151&view=rev Log: - moved helpers from lib to tests Added: trunk/storage/storage/src/testsuite/tests/helper1a.yh - copied unchanged from r60150, trunk/storage/storage/src/testsuite/lib/helper1a.ycp trunk/storage/storage/src/testsuite/tests/helper1b.yh - copied unchanged from r60150, trunk/storage/storage/src/testsuite/lib/helper1b.ycp trunk/storage/storage/src/testsuite/tests/setup-system.yh - copied unchanged from r60150, trunk/storage/storage/src/testsuite/lib/setup-system.ycp Removed: trunk/storage/storage/src/testsuite/lib/helper1a.ycp trunk/storage/storage/src/testsuite/lib/helper1b.ycp trunk/storage/storage/src/testsuite/lib/setup-system.ycp Modified: trunk/storage/storage/src/testsuite/tests/empty1.ycp trunk/storage/storage/src/testsuite/tests/empty2.ycp trunk/storage/storage/src/testsuite/tests/empty3.ycp trunk/storage/storage/src/testsuite/tests/empty4.ycp trunk/storage/storage/src/testsuite/tests/empty5.ycp trunk/storage/storage/src/testsuite/tests/empty6.ycp trunk/storage/storage/src/testsuite/tests/half-empty1.ycp trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp trunk/storage/storage/src/testsuite/tests/windows-only1.ycp trunk/storage/storage/src/testsuite/tests/windows1.ycp Modified: trunk/storage/storage/src/testsuite/tests/empty1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty1.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("empty"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -13,5 +13,5 @@ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/empty2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty2.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty2.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("empty"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -13,5 +13,5 @@ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/empty3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty3.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty3.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("empty"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -14,5 +14,5 @@ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/empty4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty4.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty4.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("empty"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -14,5 +14,5 @@ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/empty5.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty5.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("empty"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -13,5 +13,5 @@ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/empty6.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty6.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("empty"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -13,5 +13,5 @@ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/half-empty1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/half-empty1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/half-empty1.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("half-empty"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -12,5 +12,5 @@ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("reuse-home"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -13,5 +13,5 @@ ProductFeatures::SetStringFeature("partitioning", "root_max_size", "20 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "15 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/windows-only1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows-only1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/windows-only1.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("windows-only"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -13,5 +13,5 @@ ProductFeatures::SetStringFeature("partitioning", "root_max_size", "20 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "15 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } Modified: trunk/storage/storage/src/testsuite/tests/windows1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/windows1.ycp Fri Dec 18 14:43:22 2009 @@ -1,10 +1,10 @@ -// testedfiles: helper1b.ycp +// testedfiles: helper1b.yh { - include "./lib/setup-system.ycp"; + include "./tests/setup-system.yh"; setup_system("windows"); - include "./lib/helper1a.ycp"; + include "./tests/helper1a.yh"; import "ProductFeatures"; @@ -13,5 +13,5 @@ ProductFeatures::SetStringFeature("partitioning", "root_max_size", "20 GB"); ProductFeatures::SetStringFeature("partitioning", "root_base_size", "15 GB"); - include "./lib/helper1b.ycp"; + include "./tests/helper1b.yh"; } -- 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] r60150 - in /trunk/core: VERSION libycp/src/include/ycp/pathsearch.h libycp/src/pathsearch.cc package/yast2-core.changes yast2-core.spec.in
by aschnell＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: aschnell Date: Fri Dec 18 14:34:11 2009 New Revision: 60150 URL: http://svn.opensuse.org/viewcvs/yast?rev=60150&view=rev Log: - allow Y2DIR to be a list of paths separated by ":" Modified: trunk/core/VERSION trunk/core/libycp/src/include/ycp/pathsearch.h trunk/core/libycp/src/pathsearch.cc trunk/core/package/yast2-core.changes trunk/core/yast2-core.spec.in Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=60150&r1=60149&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Dec 18 14:34:11 2009 @@ -1 +1 @@ -2.18.19 +2.19.0 Modified: trunk/core/libycp/src/include/ycp/pathsearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/path… ============================================================================== --- trunk/core/libycp/src/include/ycp/pathsearch.h (original) +++ trunk/core/libycp/src/include/ycp/pathsearch.h Fri Dec 18 14:34:11 2009 @@ -29,8 +29,10 @@ #include <string> #include <list> +#include <vector> using std::string; +using std::vector; class Y2PathSearch @@ -100,9 +102,13 @@ protected: static bool searchPrefixWarn; + static vector<string> getPaths(); + private: static int defaultComponentLevel (); + static vector<string> paths; + static void initializePaths(); }; /** Modified: trunk/core/libycp/src/pathsearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/pathsearch.cc?re… ============================================================================== --- trunk/core/libycp/src/pathsearch.cc (original) +++ trunk/core/libycp/src/pathsearch.cc Fri Dec 18 14:34:11 2009 @@ -28,105 +28,103 @@ #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> +#include <boost/algorithm/string.hpp> #include <ycp/y2log.h> #include "pathsearch.h" -// watch out, duplicated in YCPPathSearch::initialize -static const char *paths[] = + +bool Y2PathSearch::searchPrefixWarn = true; + + +vector<string> +Y2PathSearch::getPaths() { - "/y2update", // Necessary during installation, but - // can be achieved using -I and -M in - // the yast2 start script - // And more unimplemented stuff for scrconf... - "Y2DIR", // replace with env. var. Y2DIR - "HOME", // replace with users home dir + /.yast2 - YAST2DIR -}; + vector<string> ret; + ret.push_back(string("/y2update")); -static const int NUM_LEVELS = sizeof (paths) / sizeof (paths[0]); + const char* y2dir = getenv("Y2DIR"); + if (y2dir) + { + vector<string> y2dirs; + boost::split(y2dirs, y2dir, boost::is_any_of(":")); + for (vector<string>::const_iterator it = y2dirs.begin(); it != y2dirs.end(); ++it) + { + if (*it != YAST2DIR) // prevent path duplication + ret.push_back(*it); + } + } + + const char* home = getenv("HOME"); + if (home) + { + ret.push_back(string(home) + "/.yast2"); + } + + ret.push_back(string(YAST2DIR)); + + y2debug("getPaths %s", boost::join(ret, " ").c_str()); + + return ret; +} + + +vector<string> Y2PathSearch::paths; + + +void +Y2PathSearch::initializePaths() +{ + if (paths.empty()) + paths = getPaths(); +} -bool Y2PathSearch::searchPrefixWarn = true; int -Y2PathSearch::numberOfComponentLevels () +Y2PathSearch::numberOfComponentLevels() { - return NUM_LEVELS; + initializePaths(); + return paths.size(); } string Y2PathSearch::searchPath (WHAT what, int level) { - static string *my_paths = 0; - - if (!my_paths) - { - // note: never deleted - my_paths = new string [NUM_LEVELS]; + initializePaths(); - const char *home = getenv ("HOME"); - const char *y2dir = getenv ("Y2DIR"); - - for (int i = 0; i < NUM_LEVELS; i++) - { - // #330965, avoid publicly writable dirs in search path - // (we return a nonexistent dir because the API does not - // allow us to say Skip, and a cleanup patch to fix that - // would be too large) - static const char * not_there = YAST2DIR "/not-there"; - if (strcmp (paths[i], "HOME") == 0) - { - if (home) - my_paths[i] = string (home) + "/.yast2"; - else - my_paths[i] = string (not_there); - } - else if (strcmp (paths[i], "Y2DIR") == 0) - { - if (y2dir - && (strcmp (YAST2DIR, y2dir) != 0)) // prevent path duplication - my_paths[i] = string (y2dir); - else - my_paths[i] = string (not_there); - } - else - { - my_paths[i] = string (paths[i]); - } - } - } + int levels = paths.size(); switch (what) { case EXECCOMP: - if (level == NUM_LEVELS - 1) // FIXME + if (level == levels - 1) // FIXME { return EXECCOMPDIR; } else { - return my_paths[level]; + return paths[level]; } break; case PLUGIN: - if (level == NUM_LEVELS - 1) // FIXME + if (level == levels - 1) // FIXME { return PLUGINDIR; } else { - return my_paths[level] + "/plugin"; + return paths[level] + "/plugin"; } break; default: break; } - return my_paths[level]; + return paths[level]; } @@ -166,7 +164,10 @@ string Y2PathSearch::findy2 (string filename, int mode, int level) { - for (int i = 0; i < NUM_LEVELS; i++) + initializePaths(); + + int levels = paths.size(); + for (int i = 0; i < levels; i++) { // for level == -1, all levels are scanned if ((level >= 0) && (i != level)) @@ -180,7 +181,7 @@ if (access (pathname.c_str(), mode) == 0) { // FIXME: this check is different for clients and for modules - see find - if( searchPrefixWarn && i != NUM_LEVELS-1 ) + if( searchPrefixWarn && i != levels - 1 ) { y2warning( "Using special search prefix '%s' for '%s'",searchPath (GENERIC, i).c_str(), pathname.c_str() ); } @@ -247,7 +248,10 @@ int Y2PathSearch::defaultComponentLevel () { - for (int i = 0; i < NUM_LEVELS; i++) + initializePaths(); + + int levels = paths.size(); + for (int i = 0; i < levels; i++) { if (searchPath (GENERIC, i) == YAST2DIR) { @@ -255,7 +259,7 @@ } } /* NOTREACHED */ - return NUM_LEVELS - 1; + return levels - 1; } @@ -264,7 +268,7 @@ { // Determine current component level int current_level = defaultComponentLevel (); - char *levelstring = getenv ("Y2LEVEL"); + const char* levelstring = getenv ("Y2LEVEL"); if (levelstring) { current_level = atoi (levelstring); @@ -277,26 +281,15 @@ bool YCPPathSearch::initialized = false; -// watch out, duplicated in char *paths[] + void YCPPathSearch::initialize (Kind kind, const char *suffix) { - const char *home = getenv ("HOME"); - const char *y2dir = getenv ("Y2DIR"); - searchPrefixWarn = (getenv ("Y2SILENTSEARCH") == NULL); - addPath (kind, string (YAST2DIR) + suffix); - if (home) - { - string homey2 = string (home) + "/.yast2"; - addPath (kind, homey2 + suffix); - } - if (y2dir) - { - addPath (kind, string (y2dir) + suffix); - } - addPath (kind, string ("/y2update") + suffix); + vector<string> paths = getPaths(); + for (vector<string>::const_reverse_iterator it = paths.rbegin(); it != paths.rend(); ++it) + addPath(kind, *it + suffix); } Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Dec 18 14:34:11 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 18 12:43:39 CET 2009 - aschnell(a)suse.de + +- allow Y2DIR to be a list of paths separated by ":" +- 2.19.0 + +------------------------------------------------------------------- Fri Aug 14 17:03:17 CEST 2009 - lslezak(a)suse.cz - don't generate autodocs on ARM (doesn't work in qemu-arm) Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=6015… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Fri Dec 18 14:34:11 2009 @@ -5,7 +5,7 @@ Group: System/YaST License: GPL v2 or later # obviously -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ boost-devel # we have a parser BuildRequires: flex bison # needed for all yast packages -- 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] <web-client> master : adapt frontend to time sending utc status as boolean
by Josef Reidinger 18 Dec '09

18 Dec '09

ref: refs/heads/master commit d271b980452226633e98335adf9ad571488a43d4 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 18 13:52:18 2009 +0100 adapt frontend to time sending utc status as boolean --- .../systemtime/app/views/systemtime/index.rhtml | 4 +++- plugins/systemtime/lib/systemtime.rb | 1 + .../test/functional/systemtime_controller_test.rb | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index 04c8d9e..d2aab05 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -64,14 +64,16 @@ :disabled => disabled}) %> </span> </p> + <% unless @utcstatus.nil? %> <p> <% #don't use check_box helper as it generate also hidden opposite value %> <input type="checkbox" name="utc" id="utc" value="true" - <%= "checked=\"checked\"" if @utcstatus == "UTC"%> + <%= "checked=\"checked\"" if @utcstatus %> <%= "disabled=\"disabled\"" if disabled %> /> <span class="form-details"><%=_("Hardware clock is set to UTC")%></span> </p> + <% end %> </fieldset> <fieldset> <p> diff --git a/plugins/systemtime/lib/systemtime.rb b/plugins/systemtime/lib/systemtime.rb index fd95c52..9fe22c3 100644 --- a/plugins/systemtime/lib/systemtime.rb +++ b/plugins/systemtime/lib/systemtime.rb @@ -12,4 +12,5 @@ def fill_proxy_with_timezone(proxy,params,timezones) tmz = region.entries.find { |e| e.name == params[:timezone]} proxy.timezone = tmz.id if tmz + proxy.utcstatus = params[:utc] == "true" end diff --git a/plugins/systemtime/test/functional/systemtime_controller_test.rb b/plugins/systemtime/test/functional/systemtime_controller_test.rb index 0af6b97..70e2995 100644 --- a/plugins/systemtime/test/functional/systemtime_controller_test.rb +++ b/plugins/systemtime/test/functional/systemtime_controller_test.rb @@ -59,7 +59,7 @@ class SystemtimeControllerTest < ActionController::TestCase ] @time = "12:18:00" @date = "07/02/2009" - @utcstatus = "localtime" + @utcstatus = false @timezone = "Europe/Prague" end @@ -118,7 +118,7 @@ class SystemtimeControllerTest < ActionController::TestCase assert_redirected_to :controller => "controlpanel", :action => "index" assert @result.saved - assert_equal "localtime",(a)result.utcstatus + assert_equal false,(a)result.utcstatus end def test_commit_wizard @@ -131,7 +131,7 @@ class SystemtimeControllerTest < ActionController::TestCase assert_redirected_to :controller => "controlpanel", :action => "nextstep" assert @result.saved - assert_equal "localtime",(a)result.utcstatus + assert_equal false, @result.utcstatus end def test_ntp_force -- 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] <web-client> backgroud_patches_bnc550934 : adapt frontend to time sending utc status as boolean
by Josef Reidinger 18 Dec '09

18 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit d271b980452226633e98335adf9ad571488a43d4 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 18 13:52:18 2009 +0100 adapt frontend to time sending utc status as boolean --- .../systemtime/app/views/systemtime/index.rhtml | 4 +++- plugins/systemtime/lib/systemtime.rb | 1 + .../test/functional/systemtime_controller_test.rb | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index 04c8d9e..d2aab05 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -64,14 +64,16 @@ :disabled => disabled}) %> </span> </p> + <% unless @utcstatus.nil? %> <p> <% #don't use check_box helper as it generate also hidden opposite value %> <input type="checkbox" name="utc" id="utc" value="true" - <%= "checked=\"checked\"" if @utcstatus == "UTC"%> + <%= "checked=\"checked\"" if @utcstatus %> <%= "disabled=\"disabled\"" if disabled %> /> <span class="form-details"><%=_("Hardware clock is set to UTC")%></span> </p> + <% end %> </fieldset> <fieldset> <p> diff --git a/plugins/systemtime/lib/systemtime.rb b/plugins/systemtime/lib/systemtime.rb index fd95c52..9fe22c3 100644 --- a/plugins/systemtime/lib/systemtime.rb +++ b/plugins/systemtime/lib/systemtime.rb @@ -12,4 +12,5 @@ def fill_proxy_with_timezone(proxy,params,timezones) tmz = region.entries.find { |e| e.name == params[:timezone]} proxy.timezone = tmz.id if tmz + proxy.utcstatus = params[:utc] == "true" end diff --git a/plugins/systemtime/test/functional/systemtime_controller_test.rb b/plugins/systemtime/test/functional/systemtime_controller_test.rb index 0af6b97..70e2995 100644 --- a/plugins/systemtime/test/functional/systemtime_controller_test.rb +++ b/plugins/systemtime/test/functional/systemtime_controller_test.rb @@ -59,7 +59,7 @@ class SystemtimeControllerTest < ActionController::TestCase ] @time = "12:18:00" @date = "07/02/2009" - @utcstatus = "localtime" + @utcstatus = false @timezone = "Europe/Prague" end @@ -118,7 +118,7 @@ class SystemtimeControllerTest < ActionController::TestCase assert_redirected_to :controller => "controlpanel", :action => "index" assert @result.saved - assert_equal "localtime",(a)result.utcstatus + assert_equal false,(a)result.utcstatus end def test_commit_wizard @@ -131,7 +131,7 @@ class SystemtimeControllerTest < ActionController::TestCase assert_redirected_to :controller => "controlpanel", :action => "nextstep" assert @result.saved - assert_equal "localtime",(a)result.utcstatus + assert_equal false, @result.utcstatus end def test_ntp_force -- 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] <web-client> master : handle PackageKit errors (bnc #559233)
by Stefan Schubert 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 547aa5b85029bdfd4b37ef9464be2494508f4e0d Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Dec 18 13:51:40 2009 +0100 handle PackageKit errors (bnc #559233) --- .../app/controllers/patch_updates_controller.rb | 32 ++++++++++++++++--- .../views/patch_updates/_patch_summary.html.erb | 2 +- .../app/views/patch_updates/index.html.erb | 2 +- .../package/yast2-webclient-patch_updates.changes | 5 +++ 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/plugins/patch_updates/app/controllers/patch_updates_controller.rb b/plugins/patch_updates/app/controllers/patch_updates_controller.rb index 79d5f73..db14fb3 100644 --- a/plugins/patch_updates/app/controllers/patch_updates_controller.rb +++ b/plugins/patch_updates/app/controllers/patch_updates_controller.rb @@ -13,7 +13,19 @@ class PatchUpdatesController < ApplicationController # GET /patch_updates # GET /patch_updates.xml def index - @patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all + begin + @patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all + rescue ActiveResource::ServerError => e + error_hash = Hash.from_xml e.response.body + logger.warn error_hash.inspect + if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" + flash[:error] = error_hash["error"]["description"] + @patch_updates = [] + @error = true + else + raise e + end + end logger.debug "Available patches: #{(a)patch_updates.inspect}" end @@ -23,11 +35,21 @@ class PatchUpdatesController < ApplicationController patch_updates = nil begin patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all - rescue Exception => e + rescue ActiveResource::ClientError => e error = ClientException.new(e) patch_updates = nil - end - + error_string = _("A problem occured when loading patch information.") + rescue ActiveResource::ServerError => e + error_hash = Hash.from_xml e.response.body + logger.warn error_hash.inspect + if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" + error_string = error_hash["error"]["description"] + else + error_string = _("A problem occured when loading patch information.") + end + error = ClientException.new(e) + patch_updates = nil + end patches_summary = nil if patch_updates @@ -43,7 +65,7 @@ class PatchUpdatesController < ApplicationController end respond_to do |format| - format.html { render :partial => "patch_summary", :locals => { :patch => patches_summary, :error => error } } + format.html { render :partial => "patch_summary", :locals => { :patch => patches_summary, :error => error, :error_string => error_string } } format.json { render :json => patches_summary } end end diff --git a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb index 37e9aac..1a15282 100644 --- a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb +++ b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb @@ -1,4 +1,4 @@ -<%= report_error(error, _("A problem occured when loading patch information.")) if error %> +<%= report_error(error, error_string) if error %> <div class="status_patches"> <% unless patch %> diff --git a/plugins/patch_updates/app/views/patch_updates/index.html.erb b/plugins/patch_updates/app/views/patch_updates/index.html.erb index 6892ff2..26c7b67 100644 --- a/plugins/patch_updates/app/views/patch_updates/index.html.erb +++ b/plugins/patch_updates/app/views/patch_updates/index.html.erb @@ -12,7 +12,7 @@ <div class='plugin-content grid_12'> <div class="loading"></div> <% if @patch_updates.empty? %> - <h3><%=_("Your system is up to date.") %></h3> + <h3><%=_("Your system is up to date.") unless @error%></h3> <%= link_to _("Back"), '/', :class=>"button" %> <% else %> <h3><%=_("Updates available") %></h3> diff --git a/plugins/patch_updates/package/yast2-webclient-patch_updates.changes b/plugins/patch_updates/package/yast2-webclient-patch_updates.changes index 88f4032..a7d1bdf 100644 --- a/plugins/patch_updates/package/yast2-webclient-patch_updates.changes +++ b/plugins/patch_updates/package/yast2-webclient-patch_updates.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Dec 17 14:15:52 CET 2009 - schubi(a)suse.de + +- handle PackageKit errors (bnc #559233) + +------------------------------------------------------------------- Thu Nov 5 13:30:04 CET 2009 - schubi(a)suse.de - update translation -- 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] <web-client> backgroud_patches_bnc550934 : handle PackageKit errors (bnc #559233)
by Stefan Schubert 18 Dec '09

18 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 547aa5b85029bdfd4b37ef9464be2494508f4e0d Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Dec 18 13:51:40 2009 +0100 handle PackageKit errors (bnc #559233) --- .../app/controllers/patch_updates_controller.rb | 32 ++++++++++++++++--- .../views/patch_updates/_patch_summary.html.erb | 2 +- .../app/views/patch_updates/index.html.erb | 2 +- .../package/yast2-webclient-patch_updates.changes | 5 +++ 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/plugins/patch_updates/app/controllers/patch_updates_controller.rb b/plugins/patch_updates/app/controllers/patch_updates_controller.rb index 79d5f73..db14fb3 100644 --- a/plugins/patch_updates/app/controllers/patch_updates_controller.rb +++ b/plugins/patch_updates/app/controllers/patch_updates_controller.rb @@ -13,7 +13,19 @@ class PatchUpdatesController < ApplicationController # GET /patch_updates # GET /patch_updates.xml def index - @patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all + begin + @patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all + rescue ActiveResource::ServerError => e + error_hash = Hash.from_xml e.response.body + logger.warn error_hash.inspect + if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" + flash[:error] = error_hash["error"]["description"] + @patch_updates = [] + @error = true + else + raise e + end + end logger.debug "Available patches: #{(a)patch_updates.inspect}" end @@ -23,11 +35,21 @@ class PatchUpdatesController < ApplicationController patch_updates = nil begin patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all - rescue Exception => e + rescue ActiveResource::ClientError => e error = ClientException.new(e) patch_updates = nil - end - + error_string = _("A problem occured when loading patch information.") + rescue ActiveResource::ServerError => e + error_hash = Hash.from_xml e.response.body + logger.warn error_hash.inspect + if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" + error_string = error_hash["error"]["description"] + else + error_string = _("A problem occured when loading patch information.") + end + error = ClientException.new(e) + patch_updates = nil + end patches_summary = nil if patch_updates @@ -43,7 +65,7 @@ class PatchUpdatesController < ApplicationController end respond_to do |format| - format.html { render :partial => "patch_summary", :locals => { :patch => patches_summary, :error => error } } + format.html { render :partial => "patch_summary", :locals => { :patch => patches_summary, :error => error, :error_string => error_string } } format.json { render :json => patches_summary } end end diff --git a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb index 37e9aac..1a15282 100644 --- a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb +++ b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb @@ -1,4 +1,4 @@ -<%= report_error(error, _("A problem occured when loading patch information.")) if error %> +<%= report_error(error, error_string) if error %> <div class="status_patches"> <% unless patch %> diff --git a/plugins/patch_updates/app/views/patch_updates/index.html.erb b/plugins/patch_updates/app/views/patch_updates/index.html.erb index 6892ff2..26c7b67 100644 --- a/plugins/patch_updates/app/views/patch_updates/index.html.erb +++ b/plugins/patch_updates/app/views/patch_updates/index.html.erb @@ -12,7 +12,7 @@ <div class='plugin-content grid_12'> <div class="loading"></div> <% if @patch_updates.empty? %> - <h3><%=_("Your system is up to date.") %></h3> + <h3><%=_("Your system is up to date.") unless @error%></h3> <%= link_to _("Back"), '/', :class=>"button" %> <% else %> <h3><%=_("Updates available") %></h3> diff --git a/plugins/patch_updates/package/yast2-webclient-patch_updates.changes b/plugins/patch_updates/package/yast2-webclient-patch_updates.changes index 88f4032..a7d1bdf 100644 --- a/plugins/patch_updates/package/yast2-webclient-patch_updates.changes +++ b/plugins/patch_updates/package/yast2-webclient-patch_updates.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Dec 17 14:15:52 CET 2009 - schubi(a)suse.de + +- handle PackageKit errors (bnc #559233) + +------------------------------------------------------------------- Thu Nov 5 13:30:04 CET 2009 - schubi(a)suse.de - update translation -- 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] <rest-service> master : added BackgroundStatus test suite
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 045de6b67dfc819dddf7246a02ca7d949f35f50a Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 09:44:39 2009 +0100 added BackgroundStatus test suite --- webservice/test/unit/background_status_test.rb | 81 ++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/webservice/test/unit/background_status_test.rb b/webservice/test/unit/background_status_test.rb new file mode 100644 index 0000000..2131fa7 --- /dev/null +++ b/webservice/test/unit/background_status_test.rb @@ -0,0 +1,81 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class ObserverTest + def initialize(observable) + observable.add_observer(self) + reset + end + + def update(observable) + @changed = true + end + + def changed? + @changed + end + + def reset + @changed = false + end +end + +class BackgroundStatusTest < ActiveSupport::TestCase + def setup + @bs = BackgroundStatus.new + end + + def test_assignemnt + s = 'status' + p = 10 + sp = 5 + @bs.status = s + @bs.progress = p + @bs.subprogress = sp + + assert_equal s, @bs.status + assert_equal p, @bs.progress + assert_equal sp, @bs.subprogress + end + + def test_observing + ot = ObserverTest.new(@bs, changed_flag) + s = 'dummy status' + p = 10 + sp = 5 + + # test progress change + ot.reset + @bs.progress = p + assert ot.changed? + + ot.reset + @bs.subprogress = sp + assert ot.changed? + + ot.reset + @bs.status = s + assert ot.changed? + + # no change must not emit change event + ot.reset + @bs.progress = p + assert !ot.changed? + + ot.reset + @bs.subprogress = sp + assert !ot.changed? + + ot.reset + @bs.status = s + assert !ot.changed? + end + + def test_serialization + assert @bs.to_xml + + expected_ret = {"subprogress" => @bs.subprogress, "progress" => @bs.progress, "status" => @bs.status } + + assert_equal expected_ret, Hash.from_xml((a)bs.to_xml)["background_status"] + end + +end -- 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] <rest-service> master : testsuite update
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 19991377b2cff27da7ee4ce6ca86d12b24ac7a58 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 10:04:23 2009 +0100 testsuite update --- webservice/test/unit/background_manager_test.rb | 4 ++++ webservice/test/unit/background_status_test.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/webservice/test/unit/background_manager_test.rb b/webservice/test/unit/background_manager_test.rb index 81f0b39..61a88cf 100644 --- a/webservice/test/unit/background_manager_test.rb +++ b/webservice/test/unit/background_manager_test.rb @@ -20,10 +20,14 @@ class BackgroundManagerTest < ActiveSupport::TestCase @bm.update_progress(:dummy) assert_equal nil, @bm.get_progress(:dummy) + changed = false @bm.update_progress(:dummy) do |s| + # this block must NOT be executed s.progress = 10 + changed = true end assert_equal nil, @bm.get_progress(:dummy) + assert !changed # register a process diff --git a/webservice/test/unit/background_status_test.rb b/webservice/test/unit/background_status_test.rb index 2131fa7..c63b93d 100644 --- a/webservice/test/unit/background_status_test.rb +++ b/webservice/test/unit/background_status_test.rb @@ -38,7 +38,7 @@ class BackgroundStatusTest < ActiveSupport::TestCase end def test_observing - ot = ObserverTest.new(@bs, changed_flag) + ot = ObserverTest.new(@bs) s = 'dummy status' p = 10 sp = 5 -- 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] <rest-service> master : use constants instead of variables in tests
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 9f2f183b066c94fc8b664aef399710bb5afa28d6 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 12:45:47 2009 +0100 use constants instead of variables in tests --- webservice/test/unit/background_status_test.rb | 36 +++++++++++------------ 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/webservice/test/unit/background_status_test.rb b/webservice/test/unit/background_status_test.rb index c63b93d..607f7e3 100644 --- a/webservice/test/unit/background_status_test.rb +++ b/webservice/test/unit/background_status_test.rb @@ -19,54 +19,52 @@ class ObserverTest end end +TEST_STATUS = 'testing status' +TEST_PROGRESS = 10 +TEST_SUBPROGRESS = 5 + class BackgroundStatusTest < ActiveSupport::TestCase def setup @bs = BackgroundStatus.new end def test_assignemnt - s = 'status' - p = 10 - sp = 5 - @bs.status = s - @bs.progress = p - @bs.subprogress = sp - - assert_equal s, @bs.status - assert_equal p, @bs.progress - assert_equal sp, @bs.subprogress + @bs.status = TEST_STATUS + @bs.progress = TEST_PROGRESS + @bs.subprogress = TEST_SUBPROGRESS + + assert_equal TEST_STATUS, @bs.status + assert_equal TEST_PROGRESS, @bs.progress + assert_equal TEST_SUBPROGRESS, @bs.subprogress end def test_observing ot = ObserverTest.new(@bs) - s = 'dummy status' - p = 10 - sp = 5 # test progress change ot.reset - @bs.progress = p + @bs.progress = TEST_PROGRESS assert ot.changed? ot.reset - @bs.subprogress = sp + @bs.subprogress = TEST_SUBPROGRESS assert ot.changed? ot.reset - @bs.status = s + @bs.status = TEST_STATUS assert ot.changed? # no change must not emit change event ot.reset - @bs.progress = p + @bs.progress = TEST_PROGRESS assert !ot.changed? ot.reset - @bs.subprogress = sp + @bs.subprogress = TEST_SUBPROGRESS assert !ot.changed? ot.reset - @bs.status = s + @bs.status = TEST_STATUS assert !ot.changed? end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0