cosmos 3.0.0 → 3.0.1

data/spec/tools/cmd_tlm_server/background_tasks_spec.rb

@@ -35,13 +35,13 @@ module Cosmos
         tf.close
         config = CmdTlmServerConfig.new(tf.path)
         bt = BackgroundTasks.new(config)
-        num_threads = Thread.list.length
         bt.start
         sleep 0.1
-        Thread.list.length.should eql (num_threads + 1)
+        # 2 because the RSpec main thread plus the background task
+        Thread.list.length.should eql(2)
         bt.stop
-        sleep 0.1
-        Thread.list.length.should eql num_threads
+        sleep 0.2
+        Thread.list.length.should eql(1)
 
         tf.unlink
         File.delete(File.join(Cosmos::USERPATH,'lib','my_bg_task1.rb'))
@@ -61,14 +61,14 @@ module Cosmos
           end
           config = CmdTlmServerConfig.new(tf.path)
           bt = BackgroundTasks.new(config)
-          num_threads = Thread.list.length
           bt.start
-          Thread.list.length.should eql (num_threads + 1)
+          # 2 because the RSpec main thread plus the background task
+          Thread.list.length.should eql(2)
           sleep 1.1 # Allow the thread to crash
-          Thread.list.length.should eql num_threads
+          Thread.list.length.should eql(1)
           bt.stop
-          sleep 0.1
-          Thread.list.length.should eql num_threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "Background Task thread unexpectedly died"
         end
@@ -79,4 +79,3 @@ module Cosmos
 
   end
 end
-

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -109,6 +109,11 @@ module Cosmos
           config.packet_log_writer_pairs["DEFAULT"].cmd_log_writer.logging_enabled.should be_truthy
           config.packet_log_writer_pairs["MY_WRITER"].cmd_log_writer.logging_enabled.should be_falsey
           tf.unlink
+          config.packet_log_writer_pairs.each do |name, plwp|
+            plwp.cmd_log_writer.shutdown
+            plwp.tlm_log_writer.shutdown
+          end
+          sleep(0.2)
         end
       end
 

data/spec/tools/cmd_tlm_server/cmd_tlm_server_spec.rb

@@ -21,13 +21,10 @@ module Cosmos
       File.open(cts,'w') do |file|
         file.puts 'INTERFACE INT interface.rb'
       end
-
-      @start_threads = Thread.list.length
     end
 
     after(:all) do
       clean_config()
-      Thread.list.length.should eql @start_threads
     end
 
     before(:each) do
@@ -52,7 +49,7 @@ module Cosmos
         # Verify we can't start another CTS
         expect { CmdTlmServer.new }.to raise_error(FatalError, /Error starting JsonDRb on port 7777/)
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
 
       it "should create the CTS in production mode" do
@@ -65,7 +62,7 @@ module Cosmos
         CmdTlmServer.json_drb.method_whitelist.should_not include('stop_cmd_log')
         CmdTlmServer.json_drb.method_whitelist.should_not include('stop_tlm_log')
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
    end
 
@@ -81,7 +78,7 @@ module Cosmos
         cts.start # Call start again ... it should do nothing
         Thread.list.length.should eql threads
         cts.stop
-        sleep 0.1
+        sleep 0.2
 
         expect_any_instance_of(PacketLogging).to receive(:start)
         # Now start the server in production mode
@@ -92,7 +89,7 @@ module Cosmos
         CmdTlmServer.json_drb.method_whitelist.should_not include('stop_cmd_log')
         CmdTlmServer.json_drb.method_whitelist.should_not include('stop_tlm_log')
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
 
       it "should monitor the staleness thread" do
@@ -104,7 +101,7 @@ module Cosmos
           cts = CmdTlmServer.new
           sleep 0.1
           cts.stop
-          sleep 0.1
+          sleep 0.2
 
           stdout.string.should match "Staleness Monitor thread unexpectedly died"
         end
@@ -137,7 +134,7 @@ module Cosmos
           stdout.string.should match "<R>TGT PKT TEST = 100 is RED"
 
           cts.stop
-          sleep 0.1
+          sleep 0.2
         end
       end
 
@@ -159,7 +156,7 @@ module Cosmos
         cts.limits_change_callback(pkt, pi, :YELLOW, 100, true)
         sleep 0.1
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
 
       it "should log limits response errors" do
@@ -177,7 +174,7 @@ module Cosmos
 
           stdout.string.should match "TGT PKT TEST Limits Response Exception!"
           cts.stop
-          sleep 0.1
+          sleep 0.2
         end
       end
     end
@@ -216,7 +213,7 @@ module Cosmos
         state.should eql :YELLOW
 
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
 
       it "should delete queues after the max events is reached" do
@@ -242,7 +239,7 @@ module Cosmos
         expect { CmdTlmServer.get_limits_event(id) }.to raise_error("Limits event queue with id #{id} not found")
 
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
     end
 
@@ -267,7 +264,7 @@ module Cosmos
         expect { CmdTlmServer.get_limits_event(id) }.to raise_error("Limits event queue with id #{id} not found")
 
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
     end
 
@@ -313,7 +310,7 @@ module Cosmos
         end
 
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
 
       it "should delete queues after the max packets is reached" do
@@ -348,7 +345,7 @@ module Cosmos
         expect { CmdTlmServer.get_packet_data(id) }.to raise_error("Packet data queue with id #{id} not found")
 
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
     end
 
@@ -382,7 +379,7 @@ module Cosmos
         expect { CmdTlmServer.get_packet_data(id) }.to raise_error("Packet data queue with id #{id} not found")
 
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
     end
 
@@ -393,7 +390,7 @@ module Cosmos
 
         expect { CmdTlmServer.get_packet_data(id, true) }.to raise_error(ThreadError)
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
     end
 
@@ -409,7 +406,7 @@ module Cosmos
 
         CmdTlmServer.json_drb.request_count.should eql 0
         cts.stop
-        sleep 0.1
+        sleep 0.2
       end
     end
 

data/spec/tools/cmd_tlm_server/interface_thread_spec.rb

@@ -57,13 +57,12 @@ module Cosmos
           allow(@interface).to receive(:connected?).and_return(false)
           allow(@interface).to receive(:connect) { raise "ConnectError" }
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "Connection Failed: ConnectError"
         end
@@ -83,13 +82,12 @@ module Cosmos
             error.message.should eql "ConnectError"
             error_count += 1
           end
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
           error_count.should eql 2
 
           stdout.string.should_not match "Connection Failed: ConnectError"
@@ -99,13 +97,12 @@ module Cosmos
       it "should log the connection" do
         capture_io do |stdout|
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "Connection Success"
         end
@@ -118,13 +115,12 @@ module Cosmos
           thread.connection_success_callback = Proc.new do
             callback_called = true
           end
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
           callback_called.should be_truthy
 
           stdout.string.should_not match "Connection Success"
@@ -139,13 +135,12 @@ module Cosmos
           # create see the error twice.
           @interface.reconnect_delay = 0.06
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "Connection Lost"
         end
@@ -160,15 +155,14 @@ module Cosmos
           thread.connection_lost_callback = Proc.new do
             callback_called = true
           end
-          threads = Thread.list.length
           thread.start
           sleep 0.1
           # Since we set auto_reconnect to false we shouldn't see the interface
           # thread because it will be killed
-          Thread.list.length.should eql threads
+          Thread.list.length.should eql(1)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
           callback_called.should be_truthy
 
           stdout.string.should_not match "Connection Lost"
@@ -179,13 +173,12 @@ module Cosmos
         capture_io do |stdout|
           allow(@interface).to receive(:read) { raise "ReadError" }
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "ReadError"
         end
@@ -199,13 +192,12 @@ module Cosmos
           # create see the error twice.
           @interface.reconnect_delay = 0.06
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "ECONNRESET"
         end
@@ -218,7 +210,7 @@ module Cosmos
           thread.start
           sleep 0.1
           thread.stop
-          sleep 0.1
+          sleep 0.2
 
           stdout.string.should match "Packet reading thread unexpectedly died"
         end
@@ -236,7 +228,7 @@ module Cosmos
           thread.start
           sleep 0.1
           thread.stop
-          sleep 0.1
+          sleep 0.2
           callback_called.should be_truthy
 
           stdout.string.should_not match "Packet reading thread unexpectedly died"
@@ -247,13 +239,12 @@ module Cosmos
         capture_io do |stdout|
           @packet = Packet.new(nil,nil)
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "Unknown 2 byte packet"
         end
@@ -265,13 +256,12 @@ module Cosmos
           @packet.packet_name = 'SMITH'
           allow(System).to receive_message_chain(:telemetry,:update!).and_raise(RuntimeError)
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
           stdout.string.should match "Received unknown identified telemetry: BOB SMITH"
         end
       end
@@ -285,13 +275,12 @@ module Cosmos
           allow(router).to receive(:write) { raise "RouterWriteError" }
           @interface.routers = [router]
           thread = InterfaceThread.new(@interface)
-          threads = Thread.list.length
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
-          sleep 0.1
-          Thread.list.length.should eql threads
+          sleep 0.2
+          Thread.list.length.should eql(1)
 
           stdout.string.should match "Problem writing to router"
         end
@@ -305,10 +294,10 @@ module Cosmos
         threads = Thread.list.length
         thread.start
         sleep 0.1
-        Thread.list.length.should eql threads + 1
+        Thread.list.length.should eql(2)
         thread.stop
-        sleep 0.1
-        Thread.list.length.should eql threads
+        sleep 0.2
+        Thread.list.length.should eql(1)
       end
 
     end

data/spec/tools/cmd_tlm_server/interfaces_spec.rb

@@ -160,10 +160,12 @@ module Cosmos
         tf.puts 'ROUTE DEST2'
         tf.close
         capture_io do |stdout|
-          server = TCPServer.new(8888)
-          Thread.new do
-            client = server.accept
-            client.close
+          server = TCPServer.new('127.0.0.1', 8888)
+          clients = []
+          server_thread = Thread.new do
+            loop do
+              clients << server.accept
+            end
           end
 
           config = CmdTlmServerConfig.new(tf.path)
@@ -171,18 +173,26 @@ module Cosmos
           config.interfaces['DEST1'].routers[0].name.should eql "MY_ROUTER"
           config.interfaces['DEST2'].routers[0].name.should eql "MY_ROUTER"
           interfaces.connect("DEST1")
-          sleep 0.1
+          sleep 0.2
           stdout.string.should match "Connecting to DEST1"
           interfaces.disconnect("DEST1")
-          interfaces.connect("DEST1",'localhost',9888,9888,6,6,'length')
-          sleep 0.1
+          interfaces.connect("DEST1",'localhost',8888,8888,6,6,'length')
+          sleep 0.2
           config.interfaces['DEST1'].routers[0].name.should eql "MY_ROUTER"
           config.interfaces['DEST2'].routers[0].name.should eql "MY_ROUTER"
           stdout.string.should match "Disconnected from interface DEST1"
           stdout.string.should match "Connecting to DEST1"
           interfaces.disconnect("DEST1")
+          interfaces.stop
+
+          server_thread.kill
+          server.close
+          clients.each do |c|
+            c.close
+          end
         end
         tf.unlink
+        sleep(0.2)
       end
     end