diff options
Diffstat (limited to 'tests/test-highlight.t')
| -rw-r--r-- | tests/test-highlight.t | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/tests/test-highlight.t b/tests/test-highlight.t index 53ea7e1..7394e48 100644 --- a/tests/test-highlight.t +++ b/tests/test-highlight.t @@ -1,5 +1,5 @@ - $ "$TESTDIR/hghave" pygments serve || exit 80 + $ "$TESTDIR/hghave" pygments || exit 80 $ cat <<EOF >> $HGRCPATH > [extensions] > highlight = @@ -55,7 +55,7 @@ hg serve hgweb filerevision, html - $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/primes.py') \ + $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py') \ > | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mf\"/class=\"mi\"/g" 200 Script output follows @@ -92,7 +92,6 @@ hgweb filerevision, html <li class="active">file</li> <li><a href="/file/tip/primes.py">latest</a></li> <li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li> - <li><a href="/comparison/853dcd4de2a6/primes.py">comparison</a></li> <li><a href="/annotate/853dcd4de2a6/primes.py">annotate</a></li> <li><a href="/log/853dcd4de2a6/primes.py">file log</a></li> <li><a href="/raw-file/853dcd4de2a6/primes.py">raw</a></li> @@ -122,7 +121,7 @@ hgweb filerevision, html </tr> <tr> <th class="date">date</th> - <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td> + <td class="date age">Thu Jan 01 00:00:00 1970 +0000</td> </tr> <tr> <th class="author">parents</th> @@ -184,7 +183,7 @@ hgweb filerevision, html hgweb fileannotate, html - $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'annotate/tip/primes.py') \ + $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py') \ > | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mi\"/class=\"mf\"/g" 200 Script output follows @@ -223,7 +222,6 @@ hgweb fileannotate, html <li><a href="/file/853dcd4de2a6/primes.py">file</a></li> <li><a href="/file/tip/primes.py">latest</a></li> <li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li> - <li><a href="/comparison/853dcd4de2a6/primes.py">comparison</a></li> <li class="active">annotate</li> <li><a href="/log/853dcd4de2a6/primes.py">file log</a></li> <li><a href="/raw-annotate/853dcd4de2a6/primes.py">raw</a></li> @@ -253,7 +251,7 @@ hgweb fileannotate, html </tr> <tr> <th class="date">date</th> - <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td> + <td class="date age">Thu Jan 01 00:00:00 1970 +0000</td> </tr> <tr> <th class="author">parents</th> @@ -275,224 +273,224 @@ hgweb fileannotate, html <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l1" + <a href="/annotate/853dcd4de2a6/primes.py#1" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l1" id="l1"> 1</a> <span class="c">#!/usr/bin/env python</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l2" + <a href="/annotate/853dcd4de2a6/primes.py#2" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l2" id="l2"> 2</a> </td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l3" + <a href="/annotate/853dcd4de2a6/primes.py#3" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l3" id="l3"> 3</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l4" + <a href="/annotate/853dcd4de2a6/primes.py#4" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l4" id="l4"> 4</a> </td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l5" + <a href="/annotate/853dcd4de2a6/primes.py#5" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l5" id="l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l6" + <a href="/annotate/853dcd4de2a6/primes.py#6" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l6" id="l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l7" + <a href="/annotate/853dcd4de2a6/primes.py#7" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l7" id="l7"> 7</a> <span class="sd">"""</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l8" + <a href="/annotate/853dcd4de2a6/primes.py#8" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l8" id="l8"> 8</a> </td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l9" + <a href="/annotate/853dcd4de2a6/primes.py#9" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l9" id="l9"> 9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l10" + <a href="/annotate/853dcd4de2a6/primes.py#10" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l10" id="l10"> 10</a> </td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l11" + <a href="/annotate/853dcd4de2a6/primes.py#11" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l11" id="l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l12" + <a href="/annotate/853dcd4de2a6/primes.py#12" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l12" id="l12"> 12</a> <span class="sd">"""Generate all primes."""</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l13" + <a href="/annotate/853dcd4de2a6/primes.py#13" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l13" id="l13"> 13</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l14" + <a href="/annotate/853dcd4de2a6/primes.py#14" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l14" id="l14"> 14</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l15" + <a href="/annotate/853dcd4de2a6/primes.py#15" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l15" id="l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l16" + <a href="/annotate/853dcd4de2a6/primes.py#16" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l16" id="l16"> 16</a> <span class="c"># infinite recursion.</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l17" + <a href="/annotate/853dcd4de2a6/primes.py#17" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l17" id="l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l18" + <a href="/annotate/853dcd4de2a6/primes.py#18" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l18" id="l18"> 18</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mf">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l19" + <a href="/annotate/853dcd4de2a6/primes.py#19" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l19" id="l19"> 19</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l20" + <a href="/annotate/853dcd4de2a6/primes.py#20" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l20" id="l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l21" + <a href="/annotate/853dcd4de2a6/primes.py#21" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l21" id="l21"> 21</a> </td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l22" + <a href="/annotate/853dcd4de2a6/primes.py#22" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l22" id="l22"> 22</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mf">2</span> <span class="o">==</span> <span class="mf">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l23" + <a href="/annotate/853dcd4de2a6/primes.py#23" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l23" id="l23"> 23</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mf">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l24" + <a href="/annotate/853dcd4de2a6/primes.py#24" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l24" id="l24"> 24</a> </td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l25" + <a href="/annotate/853dcd4de2a6/primes.py#25" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l25" id="l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l26" + <a href="/annotate/853dcd4de2a6/primes.py#26" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l26" id="l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l27" + <a href="/annotate/853dcd4de2a6/primes.py#27" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l27" id="l27"> 27</a> <span class="kn">try</span><span class="p">:</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l28" + <a href="/annotate/853dcd4de2a6/primes.py#28" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l28" id="l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l29" + <a href="/annotate/853dcd4de2a6/primes.py#29" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l29" id="l29"> 29</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l30" + <a href="/annotate/853dcd4de2a6/primes.py#30" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l30" id="l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td> </tr> <tr class="parity0"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l31" + <a href="/annotate/853dcd4de2a6/primes.py#31" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l31" id="l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td> </tr> <tr class="parity1"> <td class="annotate"> - <a href="/annotate/853dcd4de2a6/primes.py#l32" + <a href="/annotate/853dcd4de2a6/primes.py#32" title="853dcd4de2a6: a">test@0</a> </td> <td class="source"><a href="#l32" id="l32"> 32</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td> @@ -511,7 +509,7 @@ hgweb fileannotate, html hgweb fileannotate, raw - $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'annotate/tip/primes.py?style=raw') \ + $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py?style=raw') \ > | sed "s/test@//" > a $ echo "200 Script output follows" > b $ echo "" >> b @@ -522,19 +520,23 @@ hgweb fileannotate, raw $ echo "" >> b $ echo "" >> b $ diff -u b a + $ echo + hgweb filerevision, raw - $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/primes.py?style=raw') \ + $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py?style=raw') \ > > a $ echo "200 Script output follows" > b $ echo "" >> b $ hg cat primes.py >> b $ diff -u b a + $ echo + hgweb highlightcss friendly - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'highlightcss' > out + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out $ head -n 4 out 200 Script output follows @@ -561,7 +563,7 @@ hg serve again hgweb highlightcss fruity - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'highlightcss' > out + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out $ head -n 4 out 200 Script output follows @@ -585,7 +587,7 @@ errors encountered > cat hg.pid >> $DAEMON_PIDS > > echo % hgweb filerevision, html - > "$TESTDIR/get-with-headers.py" localhost:$HGPORT "file/tip/$2" \ + > "$TESTDIR/get-with-headers.py" localhost:$HGPORT "/file/tip/$2" \ > | grep '<div class="parity0 source">' > echo % errors encountered > cat errors.log @@ -605,5 +607,3 @@ errors encountered % hgweb filerevision, html <div class="parity0 source"><a href="#l1" id="l1"> 1</a> ??</div> % errors encountered - - $ cd .. |