Create a regression test for the TCP fake source capability.

Also, move the ephemeral ports used for these well up into the
private-port range.

4 files changed, 31 insertions, 2 deletions

diff --git a/gps/fake.py b/gps/fake.py
index 54845e5b..634c00fc 100644
--- a/gps/fake.py
+++ b/gps/fake.py
@@ -469,7 +469,7 @@ class TestSession:
         self.writers = 0
         self.runqueue = []
         self.index = 0
-        self.baseport = 5000	# Regression tests break if you change this 
+        self.baseport = 49194	# In the IANA orivate port range
         if port:
             self.port = port
         else:
diff --git a/test/daemon/tcp-test.log b/test/daemon/tcp-test.log
new file mode 100644
index 00000000..9668b847
--- /dev/null
+++ b/test/daemon/tcp-test.log
@@ -0,0 +1,17 @@
+# Name: Generic NMEA
+# Submitter: Eric S. Raymond <esr@thyrsus.com>
+# Date: 2013-11-03
+# Transport: TCP
+# Notes: The most significant thing about this test load is not the content,
+#        but the magic cookie that tells it to feed the daemon over TCP
+#        rather than a pseudo-tty. We include spme leading garbage as a
+#        robustness check for the packetizer.  There is a UDP test load 
+#        that feeds the same content.
+,1.7,-30.40,M,-13.9,M,,*7D
+$GPGGA,193221.00,2037.72792,N,08704.08478,W,1,04,1.7,-30.40,M,-13.9,M,,*7D
+$GPGSA,A,3,10,28,09,13,,,,,,,,,03.4,01.7,03.0*00
+$GPGSV,3,1,12,28,14,150,41,09,15,254,41,10,43,192,47,13,06,081,36*7A
+$GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
+$GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,,35,45,118,*7D
+$GPRMC,193221.00,A,2037.7279,N,08704.0848,W,00.1,201.8,231207,01,W,A*2D
+$GPZDA,193223.00,23,12,2007,00,00*69
diff --git a/test/daemon/tcp-test.log.chk b/test/daemon/tcp-test.log.chk
new file mode 100644
index 00000000..b2a7e5d8
--- /dev/null
+++ b/test/daemon/tcp-test.log.chk
@@ -0,0 +1,11 @@
+$GPGGA,193221.00,2037.72792,N,08704.08478,W,1,04,1.7,-30.40,M,-13.9,M,,*7D
+{"class":"TPV","tag":"GGA","mode":3,"lat":20.628798667,"lon":-87.068079667,"alt":-30.400}

+$GPGSA,A,3,10,28,09,13,,,,,,,,,03.4,01.7,03.0*00
+{"class":"TPV","tag":"GSA","mode":3,"lat":20.628798667,"lon":-87.068079667,"alt":-30.400,"epv":69.000}

+$GPGSV,3,1,12,28,14,150,41,09,15,254,41,10,43,192,47,13,06,081,36*7A
+$GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
+$GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,,35,45,118,*7D
+{"class":"SKY","tag":"GSV","xdop":0.76,"ydop":1.60,"vdop":3.00,"tdop":0.99,"hdop":1.70,"gdop":3.70,"pdop":3.40,"satellites":[{"PRN":28,"el":14,"az":150,"ss":41,"used":true},{"PRN":9,"el":15,"az":254,"ss":41,"used":true},{"PRN":10,"el":43,"az":192,"ss":47,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":323,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":31,"az":317,"ss":0,"used":false},{"PRN":17,"el":31,"az":85,"ss":0,"used":false},{"PRN":5,"el":15,"az":318,"ss":0,"used":false},{"PRN":24,"el":2,"az":246,"ss":0,"used":false},{"PRN":120,"el":8,"az":96,"ss":0,"used":false},{"PRN":122,"el":45,"az":118,"ss":0,"used":false}]}

+$GPRMC,193221.00,A,2037.7279,N,08704.0848,W,00.1,201.8,231207,01,W,A*2D
+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-23T19:32:21.000Z","ept":0.005,"lat":20.628798333,"lon":-87.068080000,"alt":-30.400,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.051}

+$GPZDA,193223.00,23,12,2007,00,00*69
diff --git a/test/daemon/udp-test.log b/test/daemon/udp-test.log
index 3054f6d4..9b8cea48 100644
--- a/test/daemon/udp-test.log
+++ b/test/daemon/udp-test.log
@@ -5,7 +5,8 @@
 # Notes: The most significant thing about this test load is not the content,
 #        but the magic cookie that tells it to feed the daemon over UDP
 #        rather than a pseudo-tty. We include spme leading garbage as a
-#        robustness check for the packetizer.
+#        robustness check for the packetizer.  There is a TCP test load 
+#        that feeds the same content.
 ,1.7,-30.40,M,-13.9,M,,*7D
 $GPGGA,193221.00,2037.72792,N,08704.08478,W,1,04,1.7,-30.40,M,-13.9,M,,*7D
 $GPGSA,A,3,10,28,09,13,,,,,,,,,03.4,01.7,03.0*00