c99b62d7865a828f8f41c6e82dd36cbd2dd26780 markd Wed Jul 1 21:45:43 2020 -0700 hgBlat mostly works diff --git src/gfServer/tests/dynTester src/gfServer/tests/dynTester index ece8d6c..d6b2ab9 100755 --- src/gfServer/tests/dynTester +++ src/gfServer/tests/dynTester @@ -94,31 +94,31 @@ return subprocess.Popen(cmd, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE) def serverWait(gfServer): "wait for server process to exit" gfServer.wait() if gfServer.returncode != 0: raise Exception("gfServer process exited with {}".format(gfServer.returncode)) def readResults(gfServer, resultsFh): "read the results, which come back using the net string stuff" while True: resp = netRecieveString(gfServer.stdout) if len(resp) > 0: print(str(resp, encoding="latin-1"), file=resultsFh) - if resp == b'end': + if resp == b'trailerEnd': break def makeQuery(gfServer, queryType, genome, seq, resultsFh): "make a query to the server" query = "{}{} {} {}\n".format(gfSignature, queryType, len(seq), genome) print(query, file=resultsFh) writeBytes(gfServer.stdin, query) resp = readBytes(gfServer.stdout, 1) if resp != b"Y": raise Exception("expected 'Y' from gfServer, got '{}'".format(resp)) writeBytes(gfServer.stdin, seq) readResults(gfServer, resultsFh) def queryServer(rootDir, queryType, genome, seq, resultsFh):