Patchwork [2,of,3] tests: add (glob) annotations to output lines with 127.0.0.1

login
register
mail settings
Submitter Augie Fackler
Date July 10, 2016, 3:20 a.m.
Message ID <c6794e62d4954d6659b7.1468120808@imladris.local>
Download mbox | patch
Permalink /patch/15784/
State Changes Requested
Headers show

Comments

Augie Fackler - July 10, 2016, 3:20 a.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1468119825 14400
#      Sat Jul 09 23:03:45 2016 -0400
# Node ID c6794e62d4954d6659b7e3e23e8f81554a073584
# Parent  4875b0eed3de253e0a176dc7592fe1e03afba7c1
tests: add (glob) annotations to output lines with 127.0.0.1

Patch

diff --git a/tests/test-hgweb-no-path-info.t b/tests/test-hgweb-no-path-info.t
--- a/tests/test-hgweb-no-path-info.t
+++ b/tests/test-hgweb-no-path-info.t
@@ -79,16 +79,16 @@  should be used from d74fc8dec2b4 onward 
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://127.0.0.1:$HGPORT/</id>
-   <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/>
-   <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/>
+   <id>http://127.0.0.1:$HGPORT/</id> (glob)
+   <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/> (glob)
+   <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/> (glob)
    <title>repo Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>[default] test</title>
-    <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id>
-    <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/>
+    <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> (glob)
+    <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
diff --git a/tests/test-hgweb-no-request-uri.t b/tests/test-hgweb-no-request-uri.t
--- a/tests/test-hgweb-no-request-uri.t
+++ b/tests/test-hgweb-no-request-uri.t
@@ -90,16 +90,16 @@  should be used from d74fc8dec2b4 onward 
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
-   <id>http://127.0.0.1:$HGPORT/</id>
-   <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/>
-   <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/>
+   <id>http://127.0.0.1:$HGPORT/</id> (glob)
+   <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/> (glob)
+   <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/> (glob)
    <title>repo Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>[default] test</title>
-    <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id>
-    <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/>
+    <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> (glob)
+    <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
diff --git a/tests/test-https.t b/tests/test-https.t
--- a/tests/test-https.t
+++ b/tests/test-https.t
@@ -243,14 +243,14 @@  cacert mismatch
 
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub.pem" \
   > https://127.0.0.1:$HGPORT/
-  pulling from https://127.0.0.1:$HGPORT/
-  abort: 127.0.0.1 certificate error: certificate is for localhost
+  pulling from https://127.0.0.1:$HGPORT/ (glob)
+  abort: 127.0.0.1 certificate error: certificate is for localhost (glob)
   (set hostsecurity.127.0.0.1:certfingerprints=sha256:62:09:97:2f:97:60:e3:65:8f:12:5d:78:9e:35:a1:36:7a:65:4b:0e:9f:ac:db:c3:bc:6e:b6:a3:c0:16:e0:30 config setting or use --insecure to connect insecurely)
   [255]
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub.pem" \
   > https://127.0.0.1:$HGPORT/ --insecure
-  pulling from https://127.0.0.1:$HGPORT/
-  warning: connection security to 127.0.0.1 is disabled per current settings; communication is susceptible to eavesdropping and tampering
+  pulling from https://127.0.0.1:$HGPORT/ (glob)
+  warning: connection security to 127.0.0.1 is disabled per current settings; communication is susceptible to eavesdropping and tampering (glob)
   searching for changes
   no changes found
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub-other.pem"
@@ -364,7 +364,7 @@  Test https with cacert and fingerprint t
   searching for changes
   no changes found
   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://127.0.0.1:$HGPORT/ --config hostfingerprints.127.0.0.1=914f1aff87249c09b6859b88b1906d30756491ca
-  pulling from https://127.0.0.1:$HGPORT/
+  pulling from https://127.0.0.1:$HGPORT/ (glob)
   searching for changes
   no changes found