cosmos 3.0.0 → 3.0.1

data/spec/io/tcpip_server_spec.rb

@@ -28,6 +28,7 @@ module Cosmos
         sleep 0.2
         expect { server.connect }.to raise_error(/Error binding/)
         server.disconnect
+        sleep(0.2)
       end
 
       it "should create a listener thread for the read port" do
@@ -94,10 +95,11 @@ module Cosmos
           server = TcpipServer.new(8888,8888,nil,nil,'Burst')
           server.connect
           sleep 0.2
-          socket = TCPSocket.open("127.0.0.2",8888)
+          socket = TCPSocket.open("127.0.0.1",8888)
           sleep 0.2
           server.disconnect
           socket.close
+          sleep(0.2)
 
           stdout.string.should match /Tcpip server listen thread unexpectedly died/
         end
@@ -108,6 +110,8 @@ module Cosmos
       it "should return nil if there is no read port" do
         server = TcpipServer.new(8888,nil,nil,nil,'Burst')
         server.read.should be_nil
+        server.disconnect
+        sleep(0.2)
       end
 
       #~ it "should block if no data is available" do
@@ -123,7 +127,7 @@ module Cosmos
         server.connect
         sleep 0.2
 
-        socket = TCPSocket.open("127.0.0.2",8889)
+        socket = TCPSocket.open("127.0.0.1",8889)
         socket.write("\x00\x01")
         sleep 0.2
         server.num_clients.should eql 1
@@ -133,6 +137,7 @@ module Cosmos
         sleep 0.2
         server.num_clients.should eql 0
         socket.close
+        sleep(0.2)
       end
 
       it "should check the client against the ACL" do
@@ -144,13 +149,14 @@ module Cosmos
           server = TcpipServer.new(nil,8889,nil,nil,'Burst')
           server.connect
           sleep 0.2
-          socket = TCPSocket.open("127.0.0.2",8889)
+          socket = TCPSocket.open("127.0.0.1",8889)
           sleep 0.2
           server.num_clients.should eql 0
           socket.eof?.should be_truthy
           server.disconnect
           sleep 0.2
           socket.close
+          sleep(0.2)
 
           stdout.string.should match /Tcpip server rejected connection/
         end
@@ -166,12 +172,13 @@ module Cosmos
           server = TcpipServer.new(nil,8889,nil,nil,'Burst')
           server.connect
           sleep 0.2
-          socket = TCPSocket.open("127.0.0.2",8889)
+          socket = TCPSocket.open("127.0.0.1",8889)
           sleep 0.2
           server.disconnect
           sleep 0.2
           server.num_clients.should eql 0
           socket.close
+          sleep(0.2)
 
           stdout.string.should match /Tcpip server read thread unexpectedly died/
         end
@@ -186,11 +193,12 @@ module Cosmos
           server = TcpipServer.new(8888,8888,nil,nil,'Burst')
           server.connect
           sleep 0.2
-          socket = TCPSocket.open("127.0.0.2",8888)
+          socket = TCPSocket.open("127.0.0.1",8888)
           socket.write("\x00\x01")
           sleep 0.2
           server.disconnect
           socket.close
+          sleep(0.2)
 
           stdout.string.should match /Tcpip server read thread unexpectedly died/
         end
@@ -211,7 +219,7 @@ module Cosmos
         server.connect
         sleep 0.2
 
-        socket = TCPSocket.open("127.0.0.2",8888)
+        socket = TCPSocket.open("127.0.0.1",8888)
         sleep 0.2
         server.num_clients.should eql 1
         packet = Packet.new("TGT","PKT")
@@ -225,6 +233,7 @@ module Cosmos
         sleep 0.2
         server.num_clients.should eql 0
         socket.close
+        sleep(0.2)
       end
 
       it "should log an error if the write thread dies" do
@@ -240,7 +249,7 @@ module Cosmos
           server = MyTcpipServer3.new(8888,nil,nil,nil,'Burst')
           server.connect
           sleep 0.2
-          socket = TCPSocket.open("127.0.0.2",8888)
+          socket = TCPSocket.open("127.0.0.1",8888)
           sleep 0.2
           server.num_clients.should eql 1
           server.write(Packet.new("TGT","PKT"))
@@ -248,6 +257,7 @@ module Cosmos
           server.num_clients.should eql 0
           server.disconnect
           socket.close
+          sleep(0.2)
 
           stdout.string.should match /Tcpip server write thread unexpectedly died/
         end
@@ -264,11 +274,12 @@ module Cosmos
           server.connect
           server.num_clients.should eql 0
           sleep 0.2
-          socket = TCPSocket.open("127.0.0.2",8888)
+          socket = TCPSocket.open("127.0.0.1",8888)
           sleep 0.2
           server.num_clients.should eql 0
           server.disconnect
           socket.close
+          sleep(0.2)
 
           stdout.string.should match /Tcpip server lost write connection/
         end
@@ -282,11 +293,11 @@ module Cosmos
 
           server = TcpipServer.new(8888,8889,nil,nil,'Burst')
           server.connect
-          sleep 0.2
+          sleep 0.5
 
-          socket1 = TCPSocket.open("127.0.0.2",8888)
-          socket2 = TCPSocket.open("127.0.0.2",8889)
-          sleep 0.2
+          socket1 = TCPSocket.open("127.0.0.1",8888)
+          socket2 = TCPSocket.open("127.0.0.1",8889)
+          sleep 0.5
           server.num_clients.should eql 2
           packet = Packet.new("TGT","PKT")
           packet.buffer = "\x01\x02\x03\x04"
@@ -297,6 +308,7 @@ module Cosmos
           server.disconnect
           socket1.close
           socket2.close
+          sleep(0.2)
 
           stdout.string.should match /Tcpip server lost write connection/
         end
@@ -307,6 +319,8 @@ module Cosmos
       it "should return 0 if there is no read port" do
         server = TcpipServer.new(8888,nil,nil,nil,'Burst')
         server.read_queue_size.should eql 0
+        server.disconnect
+        sleep(0.2)
       end
     end
 
@@ -314,6 +328,8 @@ module Cosmos
       it "should return 0 if there is no write port" do
         server = TcpipServer.new(nil,8889,nil,nil,'Burst')
         server.write_queue_size.should eql 0
+        server.disconnect
+        sleep(0.2)
       end
     end
 

data/spec/packet_logs/packet_log_writer_spec.rb

@@ -32,33 +32,37 @@ module Cosmos
       it "should create a command log writer" do
         plw = PacketLogWriter.new(:CMD,nil,true,nil,10000000,nil,false)
         plw.write(Packet.new('',''))
-        plw.stop
+        plw.shutdown
         expect(Dir[File.join(@log_path,"*.bin")][-1]).to match("_cmd.bin")
+        sleep(0.1)
       end
 
       it "should create a telemetry log writer" do
         plw = PacketLogWriter.new(:TLM,nil,true,nil,10000000,nil,false)
         plw.write(Packet.new('',''))
-        plw.stop
+        plw.shutdown
         expect(Dir[File.join(@log_path,"*.bin")][-1]).to match("_tlm.bin")
+        sleep(0.1)
       end
 
       it "should use log_name in the filename" do
         plw = PacketLogWriter.new(:TLM,'test',true,nil,10000000,nil,false)
 
         plw.write(Packet.new('',''))
-        plw.stop
+        plw.shutdown
         expect(Dir[File.join(@log_path,"*.bin")][-1]).to match("testtlm.bin")
+        sleep(0.1)
       end
 
       it "should use the log directory" do
         plw = PacketLogWriter.new(:TLM,'packet_log_writer_spec_',true,nil,10000000,Cosmos::USERPATH,false)
         plw.write(Packet.new('',''))
-        plw.stop
+        plw.shutdown
         expect(Dir[File.join(Cosmos::USERPATH,"*packet_log_writer_spec*")][-1]).to match("_tlm.bin")
         Dir[File.join(Cosmos::USERPATH,"*packet_log_writer_spec*")].each do |file|
           File.delete file
         end
+        sleep(0.1)
       end
     end
 
@@ -68,12 +72,13 @@ module Cosmos
         pkt = Packet.new('tgt','pkt')
         pkt.buffer = "\x01\x02\x03\x04"
         plw.write(pkt)
-        plw.stop
+        plw.shutdown
         data = nil
         File.open(Dir[File.join(@log_path,"*.bin")][-1],'rb') do |file|
           data = file.read
         end
         data[-4..-1].should eql "\x01\x02\x03\x04"
+        sleep(0.1)
       end
 
       it "should not write packets if logging is disabled" do
@@ -81,8 +86,9 @@ module Cosmos
         pkt = Packet.new('tgt','pkt')
         pkt.buffer = "\x01\x02\x03\x04"
         plw.write(pkt)
-        plw.stop
+        plw.shutdown
         Dir[File.join(@log_path,"*.bin")].should be_empty
+        sleep(0.1)
       end
 
       it "should cycle the log when it a size" do
@@ -98,7 +104,8 @@ module Cosmos
         # This write pushs us past 200 so we should start a new file
         plw.write(pkt)
         Dir[File.join(@log_path,"*.bin")].length.should eql 2
-        plw.stop
+        plw.shutdown
+        sleep(0.1)
       end
 
       it "should cycle the log after a set time" do
@@ -126,10 +133,11 @@ module Cosmos
         log1_seconds = files[0].split('_')[-3].to_i * 60 + files[0].split('_')[-2].to_i
         log2_seconds = files[1].split('_')[-3].to_i * 60 + files[1].split('_')[-2].to_i
         (log2_seconds - log1_seconds).should be_within(2).of(3)
-        plw.stop
+        plw.shutdown
         # Monkey patch the constant back to the default
         PacketLogWriter.__send__(:remove_const,:CYCLE_TIME_INTERVAL)
         PacketLogWriter.const_set(:CYCLE_TIME_INTERVAL, 2)
+        sleep(0.1)
       end
 
       it "should write asynchronously to a log" do
@@ -146,6 +154,7 @@ module Cosmos
         end
         data[-4..-1].should eql "\x01\x02\x03\x04"
         plw.shutdown
+        sleep(0.1)
       end
 
       it "should handle errors creating the log file" do
@@ -159,6 +168,7 @@ module Cosmos
           plw.stop
           stdout.string.should match "Error opening"
           plw.shutdown
+          sleep(0.1)
         end
       end
 
@@ -173,6 +183,7 @@ module Cosmos
           plw.stop
           stdout.string.should match "Error closing"
           plw.shutdown
+          sleep(0.1)
         end
       end
     end
@@ -182,25 +193,28 @@ module Cosmos
         plw = PacketLogWriter.new(:TLM,nil,false,nil,10000000,nil,false)
         plw.start
         plw.write(Packet.new('',''))
-        plw.stop
+        plw.shutdown
         file = Dir[File.join(@log_path,"*.bin")][-1]
         File.size(file).should_not eql 0
+        sleep(0.1)
       end
 
       it "should add a label to the log file" do
         plw = PacketLogWriter.new(:TLM,nil,false,nil,10000000,nil,false)
         plw.start('test')
         plw.write(Packet.new('',''))
-        plw.stop
+        plw.shutdown
         expect(Dir[File.join(@log_path,"*.bin")][-1]).to match("_tlm_test.bin")
+        sleep(0.1)
       end
 
       it "should ignore bad label formats" do
         plw = PacketLogWriter.new(:TLM,nil,false,nil,10000000,nil,false)
         plw.start('my_test')
         plw.write(Packet.new('',''))
-        plw.stop
+        plw.shutdown
         expect(Dir[File.join(@log_path,"*.bin")][-1]).to match("_tlm.bin")
+        sleep(0.1)
       end
     end
 

data/spec/script/script_spec.rb

@@ -41,18 +41,22 @@ module Cosmos
       allow_any_instance_of(Interface).to receive(:read)
 
       @server = CmdTlmServer.new
+      shutdown_cmd_tlm()
+      initialize_script_module()
       sleep 0.1
     end
 
     after(:each) do
       @server.stop
+      shutdown_cmd_tlm()
+      sleep(0.1)
     end
 
     describe "cmd" do
       it "should send a command" do
         capture_io do |stdout|
           cmd("INST ABORT")
-          stdout.string.should match /cmd\(\'INST ABORT\'\)/
+          stdout.string.should match /cmd\(\'INST ABORT\'\)/ #'
         end
       end
 
@@ -136,7 +140,7 @@ module Cosmos
       end
 
       it "should check parameter ranges" do
-        expect { cmd_raw("INST COLLECT with TYPE 0, DURATION 20") }.to raise_error(/Command parameter 'INST COLLECT DURATION' = 20 not in valid range/)
+        expect { cmd_raw("INST COLLECT with TYPE 0, DURATION 20") }.to raise_error(/Command parameter 'INST COLLECT DURATION' = 20 not in valid range/) #'
       end
 
       it "should prompt for a hazardous command" do
@@ -189,7 +193,7 @@ module Cosmos
         capture_io do |stdout|
           cmd_raw_no_hazardous_check("INST COLLECT with TYPE 1")
           stdout.string.should match "Command INST COLLECT being sent ignoring hazardous warnings"
-          stdout.string.should match /cmd_raw\(\'INST COLLECT/
+          stdout.string.should match /cmd_raw\(\'INST COLLECT/ #'
         end
       end
     end
@@ -199,7 +203,7 @@ module Cosmos
         capture_io do |stdout|
           cmd_raw_no_checks("INST COLLECT with TYPE 1, DURATION 20")
           stdout.string.should match "Command INST COLLECT being sent ignoring hazardous warnings"
-          stdout.string.should match /cmd_raw\(\'INST COLLECT/
+          stdout.string.should match /cmd_raw\(\'INST COLLECT/ #'
         end
       end
     end

data/spec/spec_helper.rb

@@ -74,9 +74,19 @@ RSpec.configure do |config|
     Cosmos.disable_warnings do
       Object.const_set(:STDOUT, $saved_stdout_const)
     end
+    # Kill any leftover threads
+    if Thread.list.length > 1
+      Thread.list.each do |t|
+        t.kill if t != Thread.current
+      end
+      sleep(0.2)
+    end
   end
 
-  #config.after(:each) {}
+  config.after(:each) do
+    # Make sure we didn't leave any lingering threads
+    Thread.list.length.should eql(1)
+  end
 end
 
 # Clean up the spec configuration directory

data/spec/tools/cmd_tlm_server/api_spec.rb

@@ -27,21 +27,43 @@ module Cosmos
     end
 
     before(:each) do
-      allow_any_instance_of(Interface).to receive(:connected?)
-      allow_any_instance_of(Interface).to receive(:connect)
-      allow_any_instance_of(Interface).to receive(:disconnect)
-      allow_any_instance_of(Interface).to receive(:write_raw)
-      allow_any_instance_of(Interface).to receive(:read)
       @api = CmdTlmServer.new
+      config = @api.interfaces.instance_variable_get(:@config)
+      # Stub interfaces and routers.  Do this like this so that they can still be used in an after hook
+      config.interfaces.each do |interface_name, i|
+        if i.class == Cosmos::Interface
+          def i.connected?(*args)
+          end
+          def i.connect(*args)
+          end
+          def i.disconnect(*args)
+          end
+          def i.write_raw(*args)
+          end
+          def i.read(*args)
+          end
+        end
+      end
+      config.routers.each do |router_name, i|
+        if i.class == Cosmos::Interface
+          def i.connected?(*args)
+          end
+          def i.connect(*args)
+          end
+          def i.disconnect(*args)
+          end
+          def i.write_raw(*args)
+          end
+          def i.read(*args)
+          end
+        end
+      end
       allow(@api.commanding).to receive(:send_command_to_target)
     end
 
     after(:each) do
-      begin
-        @api.stop
-      rescue
-        # Ignore all errors when trying to stop
-      end
+      @api.stop
+      sleep(0.2)
     end
 
     after(:all) do
@@ -61,6 +83,7 @@ module Cosmos
     describe "cmd" do
       it "should complain about unknown targets, commands, and parameters" do
         test_cmd_unknown(:cmd)
+        sleep(0.5)
       end
 
       it "should process a string" do