summaryrefslogtreecommitdiff
path: root/gps
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2010-06-04 14:02:51 -0400
committerEric S. Raymond <esr@thyrsus.com>2010-06-04 14:02:51 -0400
commitea870c08d0581320546ff8b8fc51ced781770376 (patch)
tree8f1d09343a48d25b78d9a123299dd214626efebc /gps
parenta08cf993116e66ce26376532b6888ef80f2bdfdc (diff)
downloadgpsd-ea870c08d0581320546ff8b8fc51ced781770376.tar.gz
Rip out grubby code from a previous attempt to fix the multipacket problem.
All regression tests pass.
Diffstat (limited to 'gps')
-rw-r--r--gps/fake.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/gps/fake.py b/gps/fake.py
index 0375e920..5e45db2e 100644
--- a/gps/fake.py
+++ b/gps/fake.py
@@ -351,12 +351,6 @@ class DaemonInstance:
self.sock.sendall("-%s\r\n\x00" % path)
self.sock.recv(12)
self.sock.close()
- def quit_on_quiesce(self, num):
- "Tell the daemon to quit when it next goes quiescent."
- if self.__get_control_socket():
- self.sock.sendall("$%d\r\n\x00" % num)
- self.sock.recv(12)
- self.sock.close()
def kill(self):
"Kill the daemon instance."
if self.pid:
@@ -374,14 +368,13 @@ class TestSessionError(exceptions.Exception):
class TestSession:
"Manage a session including a daemon with fake GPSes and clients."
CLOSE_DELAY = 1
- def __init__(self, prefix=None, port=None, options=None, verbose=0, predump=False, expected=0, udp=False):
+ def __init__(self, prefix=None, port=None, options=None, verbose=0, predump=False, udp=False):
"Initialize the test session by launching the daemon."
self.prefix = prefix
self.port = port
self.options = options
self.verbose = verbose
self.predump = predump
- self.expected = expected
self.udp = udp
self.daemon = DaemonInstance()
self.fakegpslist = {}
@@ -505,9 +498,6 @@ class TestSession:
chosen.poll()
if chosen.valid & gps.PACKET_SET:
self.reporter(chosen.response)
- if self.expected:
- self.daemon.quit_on_quiesce(self.expected)
- self.expected = 0
had_output = True
else:
raise TestSessionError("test object of unknown type")