cosmos 3.1.2 → 3.2.0

data/spec/streams/fixed_stream_protocol_spec.rb

@@ -41,6 +41,7 @@ module Cosmos
     describe "read" do
       it "should complain if no interface set" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read; "\x01\x02\x03\x04"; end
         end
@@ -51,6 +52,7 @@ module Cosmos
 
       it "should read telemetry data from the stream" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read; "\x01\x02"; end
         end
@@ -60,19 +62,19 @@ module Cosmos
         interface.target_names = %w(TEST COSMOS)
         @fsp.interface = interface
         packet = @fsp.read
-        packet.received_time.to_f.should be_within(0.01).of(Time.now.to_f)
+        packet.received_time.to_f.should be_within(0.1).of(Time.now.to_f)
         packet.target_name.should eql 'COSMOS'
         packet.packet_name.should eql 'VERSION'
         packet = @fsp.read
-        packet.received_time.to_f.should be_within(0.01).of(Time.now.to_f)
+        packet.received_time.to_f.should be_within(0.1).of(Time.now.to_f)
         packet.target_name.should eql 'COSMOS'
         packet.packet_name.should eql 'LIMITS_CHANGE'
         packet = @fsp.read
-        packet.received_time.to_f.should be_within(0.01).of(Time.now.to_f)
+        packet.received_time.to_f.should be_within(0.1).of(Time.now.to_f)
         packet.target_name.should eql 'COSMOS'
         packet.packet_name.should eql 'VERSION'
         packet = @fsp.read
-        packet.received_time.to_f.should be_within(0.01).of(Time.now.to_f)
+        packet.received_time.to_f.should be_within(0.1).of(Time.now.to_f)
         packet.target_name.should eql 'COSMOS'
         packet.packet_name.should eql 'LIMITS_CHANGE'
       end
@@ -82,6 +84,7 @@ module Cosmos
 
         $index = 0
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read
             case $index

data/spec/streams/length_stream_protocol_spec.rb

@@ -32,6 +32,7 @@ module Cosmos
     describe "read" do
       it "should read BIG_ENDIAN length fields from the stream" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read
             case $index
@@ -98,6 +99,7 @@ module Cosmos
 
       it "should read LITTLE_ENDIAN length fields from the stream" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read
             case $index
@@ -166,6 +168,7 @@ module Cosmos
     describe "write" do
       it "should fill the length field and sync pattern if told to" do
         class MyStream < Stream
+          def connect; end
           @@written_data = nil
           def self.written_data
             @@written_data

data/spec/streams/preidentified_stream_protocol_spec.rb

@@ -30,6 +30,7 @@ module Cosmos
       @psp = PreidentifiedStreamProtocol.new(nil, 5)
       pkt = System.telemetry.packet("COSMOS","VERSION")
       class MyStream < Stream
+        def connect; end
         def connected?; true; end
         def read; $buffer; end
         def write(data); $buffer = data; end
@@ -58,6 +59,7 @@ module Cosmos
       it "should create a packet header" do
         pkt = System.telemetry.packet("COSMOS","VERSION")
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read; $buffer; end
           def write(data); $buffer = data; end
@@ -90,6 +92,7 @@ module Cosmos
         pkt.write("PKT_ID", 1)
         pkt.write("COSMOS", "TEST")
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read; $buffer; end
           def write(data); $buffer = data; end

data/spec/streams/serial_stream_spec.rb

@@ -100,6 +100,18 @@ module Cosmos
       end
     end
 
+    describe "connect" do
+      it "should support a connect method that does nothing" do
+        driver = double("driver")
+        expect(driver).to receive(:closed?).and_return(false)
+        expect(driver).to receive(:close).once
+        expect(SerialDriver).to receive(:new).and_return(driver)
+        ss = SerialStream.new(nil,'COM1',9600,:EVEN,1,nil,nil)
+        expect{ss.connect}.to_not raise_error
+        ss.disconnect
+      end
+    end
+
   end
 end
 

data/spec/streams/stream_protocol_spec.rb

@@ -72,6 +72,7 @@ module Cosmos
       it "should set the stream" do
         class MyStream1 < Stream; end
         stream = MyStream1.new
+        allow(stream).to receive(:connect)
         @sp.connect(stream)
         @sp.stream.should eql stream
       end
@@ -84,6 +85,7 @@ module Cosmos
 
       it "should return the status of the stream connection" do
         class MyStream2 < Stream
+          def connect; end
           def connected?; true; end
         end
         stream = MyStream2.new
@@ -96,6 +98,7 @@ module Cosmos
       it "should call disconnect on the stream" do
         $test = false
         class MyStream3 < Stream
+          def connect; end
           def disconnect; $test = true; end
         end
         stream = MyStream3.new
@@ -109,6 +112,7 @@ module Cosmos
     describe "read" do
       it "should read data from the stream" do
         class MyStream33 < Stream
+          def connect; end
           def connected?; true; end
           def read; "\x01\x02\x03\x04"; end
         end
@@ -120,6 +124,7 @@ module Cosmos
 
       it "should handle timeouts from the stream" do
         class MyStream4 < Stream
+          def connect; end
           def connected?; true; end
           def read; raise Timeout::Error; end
         end
@@ -131,6 +136,7 @@ module Cosmos
       it "should handle a sync pattern" do
         $read_cnt = 0
         class MyStream5 < Stream
+          def connect; end
           def connected?; true; end
           def read
             $read_cnt += 1
@@ -154,6 +160,7 @@ module Cosmos
       it "should handle a sync pattern split across reads" do
         $read_cnt = 0
         class MyStream6 < Stream
+          def connect; end
           def connected?; true; end
           def read
             $read_cnt += 1
@@ -177,6 +184,7 @@ module Cosmos
       it "should handle a false positive sync pattern" do
         $read_cnt = 0
         class MyStream7 < Stream
+          def connect; end
           def connected?; true; end
           def read
             $read_cnt += 1
@@ -199,6 +207,7 @@ module Cosmos
 
       it "should discard leading bytes from the stream" do
         class MyStream8 < Stream
+          def connect; end
           def connected?; true; end
           def read
             "\x01\x02\x03\x04"
@@ -214,6 +223,7 @@ module Cosmos
 
       it "should call the post_read_data method on the inteface" do
         class MyStream9 < Stream
+          def connect; end
           def connected?; true; end
           def read
             "\x01\x02\x03\x04"
@@ -263,6 +273,7 @@ module Cosmos
 
       it "should call the post_read_packet method on the inteface" do
         class MyStream10 < Stream
+          def connect; end
           def connected?; true; end
           def read
             "\x01\x02\x03\x04"
@@ -288,6 +299,7 @@ module Cosmos
       it "should call pre_write_packet on the interface" do
         $buffer = ''
         class MyStream11 < Stream
+          def connect; end
           def connected?; true; end
           def write(buffer) $buffer = buffer; end
         end
@@ -304,6 +316,7 @@ module Cosmos
       it "should write the packet buffer to the stream" do
         $buffer = ''
         class MyStream11 < Stream
+          def connect; end
           def connected?; true; end
           def write(buffer) $buffer = buffer; end
         end
@@ -318,6 +331,7 @@ module Cosmos
       it "should write the raw buffer to the stream" do
         $buffer = ''
         class MyStream11 < Stream
+          def connect; end
           def connected?; true; end
           def write(buffer) $buffer = buffer; end
         end

data/spec/streams/stream_spec.rb

@@ -19,6 +19,7 @@ module Cosmos
       it "should raise an error" do
         expect { Stream.new.read       }.to raise_error(/not defined/)
         expect { Stream.new.write(nil) }.to raise_error(/not defined/)
+        expect { Stream.new.connect }.to raise_error(/not defined/)
         expect { Stream.new.connected? }.to raise_error(/not defined/)
         expect { Stream.new.disconnect }.to raise_error(/not defined/)
       end

data/spec/streams/tcpip_client_stream_spec.rb

@@ -33,18 +33,21 @@ module Cosmos
 
       it "should use the same socket if read_port == write_port" do
         ss = TcpipClientStream.new('localhost',8888,8888,nil,nil)
+        ss.connect
         ss.connected?.should be_truthy
         ss.disconnect
       end
 
       it "should create the write socket" do
         ss = TcpipClientStream.new('localhost',8888,nil,nil,nil)
+        ss.connect
         ss.connected?.should be_truthy
         ss.disconnect
       end
 
       it "should create the read socket" do
         ss = TcpipClientStream.new('localhost',nil,8888,nil,nil)
+        ss.connect
         ss.connected?.should be_truthy
         ss.disconnect
       end

data/spec/streams/tcpip_socket_stream_spec.rb

@@ -15,15 +15,16 @@ module Cosmos
 
   describe TcpipSocketStream do
     describe "initialize, connected?" do
-      it "should be connected when initialized" do
+      it "should be not be connected when initialized" do
         ss = TcpipSocketStream.new(nil,nil,nil,nil)
-        ss.connected?.should be_truthy
+        ss.connected?.should be_falsy
       end
     end
 
     describe "read" do
       it "should raise an error if no read socket given" do
         ss = TcpipSocketStream.new('write',nil,nil,nil)
+        ss.connect
         expect { ss.read }.to raise_error("Attempt to read from write only stream")
       end
 
@@ -31,6 +32,7 @@ module Cosmos
         read = double("read_socket")
         expect(read).to receive(:recv_nonblock).and_return 'test'
         ss = TcpipSocketStream.new(nil,read,nil,nil)
+        ss.connect
         ss.read.should eql 'test'
       end
 
@@ -48,6 +50,7 @@ module Cosmos
         expect(IO).to receive(:select).at_least(:once).and_return([])
         $index = 1
         ss = TcpipSocketStream.new(nil,read,nil,nil)
+        ss.connect
         ss.read.should eql 'test'
       end
 
@@ -56,6 +59,7 @@ module Cosmos
         allow(read).to receive(:recv_nonblock).and_raise(Errno::EWOULDBLOCK)
         expect(IO).to receive(:select).at_least(:once).and_return(nil)
         ss = TcpipSocketStream.new(nil,read,nil,nil)
+        ss.connect
         expect { ss.read }.to raise_error(Timeout::Error)
       end
 
@@ -63,6 +67,7 @@ module Cosmos
         read = double("read_socket")
         allow(read).to receive(:recv_nonblock).and_raise(Errno::ECONNRESET)
         ss = TcpipSocketStream.new(nil,read,nil,nil)
+        ss.connect
         ss.read.should eql ''
       end
     end
@@ -70,6 +75,7 @@ module Cosmos
     describe "write" do
       it "should raise an error if no write port given" do
         ss = TcpipSocketStream.new(nil,'read',nil,nil)
+        ss.connect
         expect { ss.write('test') }.to raise_error("Attempt to write to read only stream")
       end
 
@@ -78,6 +84,7 @@ module Cosmos
         # Simulate only writing two bytes at a time
         expect(write).to receive(:write_nonblock).twice.and_return(2)
         ss = TcpipSocketStream.new(write,nil,nil,nil)
+        ss.connect
         ss.write('test')
       end
 
@@ -95,6 +102,7 @@ module Cosmos
         expect(IO).to receive(:select).at_least(:once).and_return([])
         $index = 1
         ss = TcpipSocketStream.new(write,nil,nil,nil)
+        ss.connect
         ss.write('test')
       end
 
@@ -103,6 +111,7 @@ module Cosmos
         allow(write).to receive(:write_nonblock).and_raise(Errno::EWOULDBLOCK)
         expect(IO).to receive(:select).at_least(:once).and_return(nil)
         ss = TcpipSocketStream.new(write,nil,nil,nil)
+        ss.connect
         expect { ss.write('test') }.to raise_error(Timeout::Error)
       end
     end
@@ -113,6 +122,7 @@ module Cosmos
         expect(write).to receive(:closed?).and_return(false)
         expect(write).to receive(:close)
         ss = TcpipSocketStream.new(write,nil,nil,nil)
+        ss.connect
         ss.connected?.should be_truthy
         ss.disconnect
         ss.connected?.should be_falsey
@@ -123,6 +133,7 @@ module Cosmos
         expect(read).to receive(:closed?).and_return(false)
         expect(read).to receive(:close)
         ss = TcpipSocketStream.new(nil,read,nil,nil)
+        ss.connect
         ss.connected?.should be_truthy
         ss.disconnect
         ss.connected?.should be_falsey
@@ -130,9 +141,10 @@ module Cosmos
 
       it "shouldn't close the socket twice" do
         socket = double("socket")
-        expect(socket).to receive(:closed?).and_return(false, true)
+        expect(socket).to receive(:closed?).and_return(false, true, true, true)
         expect(socket).to receive(:close).once
         ss = TcpipSocketStream.new(socket,socket,nil,nil)
+        ss.connect
         ss.connected?.should be_truthy
         ss.disconnect
         ss.connected?.should be_falsey

data/spec/streams/template_stream_protocol_spec.rb

@@ -32,6 +32,7 @@ module Cosmos
     describe "connect" do
       it "should support an initial read delay" do
         class MyStream1 < Stream
+          def connect; end
           def read_nonblock; []; end
         end
         stream = MyStream1.new
@@ -46,6 +47,7 @@ module Cosmos
       it "should unblock the read queue" do
         tsp = TemplateStreamProtocol.new('0xABCD','0xABCD')
         class MyStream1 < Stream
+          def connect; end
           def disconnect; end
         end
         tsp.connect(MyStream1.new)
@@ -63,6 +65,7 @@ module Cosmos
     describe "read" do
       it "should read packets from the stream" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read
             case $index
@@ -91,6 +94,7 @@ module Cosmos
       it "should work without a response" do
         $buffer = ''
         class MyStream1 < Stream
+          def connect; end
           def connected?; true; end
           def write(buffer) $buffer = buffer; end
         end
@@ -112,6 +116,7 @@ module Cosmos
         $buffer = ''
         $read_cnt = 0
         class MyStream2 < Stream
+          def connect; end
           def connected?; true; end
           def write(buffer) $buffer = buffer; end
           def read

data/spec/streams/terminated_stream_protocol_spec.rb

@@ -32,6 +32,7 @@ module Cosmos
     describe "read" do
       it "should read packets from the stream" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read
             case $index
@@ -57,6 +58,7 @@ module Cosmos
 
       it "should keep the the termination characters" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def read
             case $index
@@ -86,6 +88,7 @@ module Cosmos
     describe "write" do
       it "should append termination characters to the packet" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def write(data); $buffer = data; end
         end
@@ -104,6 +107,7 @@ module Cosmos
 
       it "should complain if the packet buffer contains the termination characters" do
         class MyStream < Stream
+          def connect; end
           def connected?; true; end
           def write(data); $buffer = data; end
         end

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -259,6 +259,27 @@ module Cosmos
         end
       end
 
+      context "with OPTION" do
+        it "should complain about too few parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'OPTION TRUE'
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, "Not enough parameters for OPTION.")
+          tf.unlink
+        end
+
+        it "should set the interface to listen on a specific address" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'OPTION LISTEN_ADDRESS 127.0.0.1'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          config.interfaces['CTSCONFIGTESTINTERFACE'].options['LISTEN_ADDRESS'].should eql(['127.0.0.1'])
+          tf.unlink
+        end
+      end
+
       context "with LOG" do
         it "should complain about too many parameters" do
           tf = Tempfile.new('unittest')
@@ -408,4 +429,3 @@ module Cosmos
     end
   end
 end
-