[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - ucb/qa

Caolán McNamara caolanm at redhat.com
Mon Feb 24 09:30:38 PST 2014


 ucb/qa/complex/ucb/UCB.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d86ecb8512d19d8dcf073ceb1fd9813554397bd4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 22 19:29:19 2014 +0000

    my upc router automatically adds .net to the domain search path
    
    i.e. I get handed an /etc/resolv.conf of
    
      domain net
      search net ...
    
    and so "nohost" resolves to "nohost.net" which actually exists, so I get an
    authentication request which is unexpected by this test which therefore falls
    over. "nohost.invalid.net" also exists btw, as are other various foo.net forms
    where foo is one of the reserved tld which don't themselves exist.
    
    So lets shove a "*" into the name which is definitely invalid, sigh.
    
    Change-Id: I8627ced9199f339ad6cca8f27752d883ebe74aad
    (cherry picked from commit b3d153528a13807d2f5347ec83c7a8d483454a75)
    Reviewed-on: https://gerrit.libreoffice.org/8181
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java
index d937638..815209a 100644
--- a/ucb/qa/complex/ucb/UCB.java
+++ b/ucb/qa/complex/ucb/UCB.java
@@ -179,7 +179,7 @@ public class UCB  {
 
     @Test public void checkWrongFtpConnection() {
         try {
-            String acountUrl = "ftp://noname:nopasswd@nohost";
+            String acountUrl = "ftp://noname:nopasswd@*nohost.invalid";
             System.out.println(acountUrl);
             init();
             Object content = getContent(acountUrl);


More information about the Libreoffice-commits mailing list