remove server.

test/test_wiki_diff_matcher.py

@@ -1,6 +1,3 @@
-# start the server
-import asyncio
-import subprocess
 from itertools import chain
 from functools import partial
 import re
@@ -11,22 +8,6 @@ from deltas import Delete, Equal, Insert, wikitext_split
 from mwpersistence import Token
 from wiki_diff_matcher import WikiDiffMatcher
 
-@pytest_asyncio.fixture(scope="module", autouse=False)
-async def start_stop_server():
-    print("starting server")
-    proc = await asyncio.create_subprocess_exec("php", "-S", "127.0.0.1:8000",
-                                                "wikidiff2_api.php", "-c", "php.ini",
-                                                stdout=subprocess.PIPE,
-                                                stderr=subprocess.PIPE)
-    # php needs a moment to actually start
-    await asyncio.sleep(0.1)
-    yield proc
-    print("stopping server")
-    proc.terminate()
-    stdout, stderr = await proc.communicate()
-    print(stdout.decode())
-    print(stderr.decode())
-
 def _replace_whitespace(match):
     if match.group(1):  # If spaces matched (e.g., '  ')
         return ' '
@@ -371,7 +352,6 @@ def test_actually_equal():
 @pytest.mark.skip
 def test_diff_consistency():
     from mwxml import Dump
-    #stream = subprocess.Popen(["7za", "x", "-so", "test/dumps/ikwiki-20180301-pages-meta-history.xml.bz2", "*.xml"], stdout=subprocess.PIPE).stdout
     dump = Dump.from_file("test/dumps/ikwiki.xml")
     for page in dump:
         revisions = [rev.text for rev in page if rev.text]
@@ -386,7 +366,7 @@ def test_diff_consistency():
             assert_equal_enough(b, rev)
             last_rev = rev
 
-#@pytest.mark.skip
+@pytest.mark.skip
 def test_benchmark_diff(benchmark):
     from mwxml import Dump
     dump = Dump.from_file("test/dumps/ikwiki.xml")
@@ -394,32 +374,5 @@ def test_benchmark_diff(benchmark):
     def next_revs():
         return [next(revs), next(revs)], {}
 
-    benchmark.pedantic(WikiDiffMatcher,setup=next_revs,iterations=1,rounds=1000, warmup_rounds=1)
-
-def test_benchmark_diff_server(start_stop_server,benchmark):
-    from mwxml import Dump
-    dump = Dump.from_file("test/dumps/ikwiki.xml")
-    revs = chain.from_iterable([rev.text for rev in page] for page in dump)
-    def next_revs():
-        return [next(revs), next(revs)], {'server':True}
-
-    benchmark.pedantic(WikiDiffMatcher,setup=next_revs,iterations=1,rounds=1000, warmup_rounds=1)
-
-@pytest.mark.skip
-def test_diff_consistency_server():
-    from mwxml import Dump
-    #stream = subprocess.Popen(["7za", "x", "-so", "test/dumps/ikwiki-20180301-pages-meta-history.xml.bz2", "*.xml"], stdout=subprocess.PIPE).stdout
-    dump = Dump.from_file("test/dumps/ikwiki.xml")
-    for page in dump:
-        revisions = [rev.text for rev in page if rev.text]
-        matcher = WikiDiffMatcher(revisions,server=True)
-        diff_processor = matcher.processor()
-        last_rev = ""
-        for rev in revisions:
-            print(rev, file=open("test_unicode_highlight_to",'w'))
-            print(last_rev, file=open("test_unicode_highlight_from",'w'))
-            ops, a, b = diff_processor.process(rev)
-            assert_equal_enough(a, last_rev)
-            assert_equal_enough(b, rev)
-            last_rev = rev
+    benchmark.pedantic(WikiDiffMatcher, setup=next_revs, iterations=1,rounds=1000, warmup_rounds=1)