tests: move handling of None "el" out of linematch()

It just seems odd for linematch() to know what None means.

Differential Revision: https://phab.mercurial-scm.org/D3879

tests/run-tests.py

@@ -1482,7 +1482,8 b' class TTest(Test):'
 
                 optional = []
                 for i, el in enumerate(els):
-
+                    r = False
+                    if el:
                     r = self.linematch(el, lout)
                     if isinstance(r, str):
                         if r == '-glob':
@@ -1606,10 +1607,9 b' class TTest(Test):'
         return TTest.rematch(res, l)
 
     def linematch(self, el, l):
-        retry = False
         if el == l: # perfect match (fast)
             return True
-        if el:
+        retry = False
             if el.endswith(b" (?)\n"):
                 retry = "retry"
                 el = el[:-5] + b"\n"