cosmos 4.5.0-java → 4.5.1-java

data/lib/cosmos/packets/parsers/xtce_converter.rb

@@ -196,7 +196,7 @@ module Cosmos
           # TODO: Handle nonunique item names
           if item.array_size
             # Requiring parameterRef for argument arrays appears to be a defect in the schema
-            xml['xtce'].send("Array#{type}RefEntry".intern, :parameterRef => item.name) do
+            xml['xtce'].public_send("Array#{type}RefEntry".intern, :parameterRef => item.name) do
               set_fixed_value(xml, item) if !packed
               xml['xtce'].DimensionList do
                 xml['xtce'].Dimension do
@@ -211,9 +211,9 @@ module Cosmos
             end
           else
             if packed
-              xml['xtce'].send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name)
+              xml['xtce'].public_send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name)
             else
-              xml['xtce'].send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name) do
+              xml['xtce'].public_send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name) do
                 set_fixed_value(xml, item)
               end
             end
@@ -256,7 +256,7 @@ module Cosmos
         attrs[:shortDescription] = item.description if item.description
         attrs[:arrayTypeRef] = (item.name + '_Type')
         attrs[:numberOfDimensions] = '1' # COSMOS Only supports one-dimensional arrays
-        xml['xtce'].send('Array' + param_or_arg + 'Type', attrs)
+        xml['xtce'].public_send('Array' + param_or_arg + 'Type', attrs)
       end
     end
 
@@ -289,7 +289,7 @@ module Cosmos
         encoding = 'unsigned'
       end
       if item.states
-        xml['xtce'].send('Enumerated' + param_or_arg + 'Type', attrs) do
+        xml['xtce'].public_send('Enumerated' + param_or_arg + 'Type', attrs) do
           to_xtce_endianness(item, xml)
           to_xtce_units(item, xml)
           xml['xtce'].IntegerDataEncoding(:sizeInBits => item.bit_size, :encoding => encoding)
@@ -308,7 +308,7 @@ module Cosmos
           type_string = 'Integer' + param_or_arg + 'Type'
           attrs[:signed] = signed
         end
-        xml['xtce'].send(type_string, attrs) do
+        xml['xtce'].public_send(type_string, attrs) do
           to_xtce_endianness(item, xml)
           to_xtce_units(item, xml)
           if (item.read_conversion and item.read_conversion.class == PolynomialConversion) or (item.write_conversion and item.write_conversion.class == PolynomialConversion)
@@ -330,7 +330,7 @@ module Cosmos
       attrs = { :name => (item.name + '_Type'), :sizeInBits => item.bit_size }
       attrs[:initialValue] = item.default if item.default and !item.array_size
       attrs[:shortDescription] = item.description if item.description
-      xml['xtce'].send('Float' + param_or_arg + 'Type', attrs) do
+      xml['xtce'].public_send('Float' + param_or_arg + 'Type', attrs) do
         to_xtce_endianness(item, xml)
         to_xtce_units(item, xml)
         if (item.read_conversion and item.read_conversion.class == PolynomialConversion) or (item.write_conversion and item.write_conversion.class == PolynomialConversion)
@@ -359,7 +359,7 @@ module Cosmos
         end
       end
       attrs[:shortDescription] = item.description if item.description
-      xml['xtce'].send(string_or_binary + param_or_arg + 'Type', attrs) do
+      xml['xtce'].public_send(string_or_binary + param_or_arg + 'Type', attrs) do
         # Don't call to_xtce_endianness for Strings or Blocks
         to_xtce_units(item, xml)
         if string_or_binary == 'String'
@@ -382,9 +382,9 @@ module Cosmos
 
     def to_xtce_item(item, param_or_arg, xml)
       if item.array_size
-        xml['xtce'].send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_ArrayType')
+        xml['xtce'].public_send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_ArrayType')
       else
-        xml['xtce'].send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_Type')
+        xml['xtce'].public_send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_Type')
       end
     end
 

data/lib/cosmos/packets/parsers/xtce_parser.rb

@@ -59,6 +59,9 @@ module Cosmos
     end
 
     def parse(filename, target_name)
+      # Fortify complains about Path Manipulation here
+      # We have previously validated the file is a .xtce file in packet_config
+      # The file is opened read-only and then immediately parsed by Nokogiri
       doc = File.open(filename) { |f| Nokogiri::XML(f, nil, nil, Nokogiri::XML::ParseOptions::STRICT | Nokogiri::XML::ParseOptions::NOBLANKS) }
       # Determine the @current_target_name
       xtce_process_element(doc.root)

data/lib/cosmos/packets/structure.rb

@@ -462,21 +462,14 @@ module Cosmos
       extend(MethodMissing)
     end
 
-    protected
-
-    MUTEX = Mutex.new
-
-    def setup_mutex
-      return if @mutex
-      MUTEX.synchronize do
-        @mutex ||= Mutex.new
-      end
-    end
-
     # Take the structure mutex to ensure the buffer does not change while you perform activities
     def synchronize
       setup_mutex()
-      @mutex.synchronize {|| yield}
+      if @mutex.owned?
+        yield
+      else
+        @mutex.synchronize {|| yield}
+      end
     end
 
     # Take the structure mutex to ensure the buffer does not change while you perform activities
@@ -509,6 +502,17 @@ module Cosmos
       end
     end
 
+    protected
+
+    MUTEX = Mutex.new
+
+    def setup_mutex
+      return if @mutex
+      MUTEX.synchronize do
+        @mutex ||= Mutex.new
+      end
+    end
+
     module MethodMissing
       # Method missing provides reading/writing item values as if they were methods to the class
       def method_missing(name, value = nil)

data/lib/cosmos/script/api_shared.rb

@@ -832,6 +832,8 @@ module Cosmos
       while true
         work_start = Time.now.sys
         value = tlm_variable(target_name, packet_name, item_name, value_type)
+        # Fortify: Dynamic Code Evaluation: Code Injection
+        # TODO: Is there anyway to sanitize the exp_to_eval?
         if eval(exp_to_eval)
           return true, value
         end
@@ -846,6 +848,8 @@ module Cosmos
 
         if canceled
           value = tlm_variable(target_name, packet_name, item_name, value_type)
+          # Fortify: Dynamic Code Evaluation: Code Injection
+          # TODO: Is there anyway to sanitize the exp_to_eval?
           if eval(exp_to_eval)
             return true, value
           else
@@ -886,6 +890,8 @@ module Cosmos
 
       while true
         work_start = Time.now.sys
+        # Fortify: Dynamic Code Evaluation: Code Injection
+        # TODO: Is there anyway to sanitize the exp_to_eval?
         if eval(exp_to_eval, context)
           return true
         end
@@ -899,6 +905,8 @@ module Cosmos
         canceled = cosmos_script_sleep(sleep_time)
 
         if canceled
+          # Fortify: Dynamic Code Evaluation: Code Injection
+          # TODO: Is there anyway to sanitize the exp_to_eval?
           if eval(exp_to_eval, context)
             return true
           else
@@ -914,6 +922,8 @@ module Cosmos
       string = "value " + comparison_to_eval
       check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
       value_str = "with value == #{value}"
+      # Fortify: Dynamic Code Evaluation: Code Injection
+      # TODO: Is there anyway to sanitize the comparison_to_eval?
       if eval(string)
         Logger.info "#{check_str} success #{value_str}"
       else

data/lib/cosmos/script/script.rb

@@ -62,7 +62,7 @@ module Cosmos
         @cmd_tlm_server.disconnect
       else
         if $disconnect_all_targets
-          return @disconnected.send(method_name, *method_params)
+          return @disconnected.public_send(method_name, *method_params)
         elsif $disconnected_targets
           name_string = nil
           if method_params[0].is_a?(String)
@@ -79,7 +79,7 @@ module Cosmos
           if name_string
             target = name_string.split(" ")[0]
             if $disconnected_targets.include?(target)
-              return @disconnected.send(method_name, *method_params)
+              return @disconnected.public_send(method_name, *method_params)
             end
           end
         end

data/lib/cosmos/tools/cmd_tlm_server/api.rb

@@ -591,14 +591,16 @@ module Cosmos
       end
 
       # Update current value table
-      cvt_packet.buffer = packet.buffer(false)
-      cvt_packet.received_time = received_time
-
-      # The interface does the following line, but I don't think inject_tlm should because it could confuse the interface
-      target.tlm_cnt += 1
-      packet.received_count += 1
-      cvt_packet.received_count += 1
-      CmdTlmServer.instance.identified_packet_callback(packet)
+      cvt_packet.synchronize do
+        cvt_packet.buffer = packet.buffer(false)
+        cvt_packet.received_time = received_time
+
+        # The interface does the following line, but I don't think inject_tlm should because it could confuse the interface
+        target.tlm_cnt += 1
+        packet.received_count += 1
+        cvt_packet.received_count += 1
+        CmdTlmServer.instance.identified_packet_callback(cvt_packet)
+      end
 
       # Find the interface for this target
       interface = target.interface

data/lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb

@@ -96,7 +96,7 @@ module Cosmos
         button_layout.addWidget(button, location[0], location[1])
         button.connect(SIGNAL('clicked()')) do
           begin
-            CmdTlmServer.instance.send(method, 'ALL')
+            CmdTlmServer.instance.public_send(method, 'ALL')
           rescue Exception => error
             statusBar.showMessage(error.message)
           end

data/lib/cosmos/tools/cmd_tlm_server/interface_thread.rb

@@ -148,51 +148,54 @@ module Cosmos
         if packet.identified?
           begin
             # Preidentifed packet - place it into the current value table
-            identified_packet = System.telemetry.update!(packet.target_name,
-                                                         packet.packet_name,
-                                                         packet.buffer)
+            identified_packet = System.telemetry.packet(packet.target_name, packet.packet_name)
           rescue RuntimeError
             # Packet identified but we don't know about it
             # Clear packet_name and target_name and try to identify
             Logger.warn "Received unknown identified telemetry: #{packet.target_name} #{packet.packet_name}"
             packet.target_name = nil
             packet.packet_name = nil
-            identified_packet = System.telemetry.identify!(packet.buffer,
-                                                           @interface.target_names)
+            identified_packet = System.telemetry.identify(packet.buffer, @interface.target_names)
           end
         else
           # Packet needs to be identified
-          identified_packet = System.telemetry.identify!(packet.buffer,
-                                                         @interface.target_names)
+          identified_packet = System.telemetry.identify(packet.buffer, @interface.target_names)
         end
       end
 
-      if identified_packet
+      unknown = false
+      unless identified_packet
+        unknown = true
+        identified_packet = System.telemetry.packet('UNKNOWN', 'UNKNOWN')
+      end
+      
+      identified_packet.synchronize do
+        identified_packet.buffer = packet.buffer unless packet.stored
         identified_packet.received_time = packet.received_time
         identified_packet.stored = packet.stored
         identified_packet.extra = packet.extra
         packet = identified_packet
-      else
-        unknown_packet = System.telemetry.update!('UNKNOWN', 'UNKNOWN', packet.buffer)
-        unknown_packet.received_time = packet.received_time
-        unknown_packet.stored = packet.stored
-        unknown_packet.extra = packet.extra
-        packet = unknown_packet
-        data_length = packet.length
-        string = "#{@interface.name} - Unknown #{data_length} byte packet starting: "
-        num_bytes_to_print = [UNKNOWN_BYTES_TO_PRINT, data_length].min
-        data_to_print = packet.buffer(false)[0..(num_bytes_to_print - 1)]
-        data_to_print.each_byte do |byte|
-          string << sprintf("%02X", byte)
+        
+        if unknown
+          data_length = packet.length
+          string = "#{@interface.name} - Unknown #{data_length} byte packet starting: "
+          num_bytes_to_print = [UNKNOWN_BYTES_TO_PRINT, data_length].min
+          data_to_print = packet.buffer(false)[0..(num_bytes_to_print - 1)]
+          data_to_print.each_byte do |byte|
+            string << sprintf("%02X", byte)
+          end
+          Logger.error string
         end
-        Logger.error string
-      end
 
-      target = System.targets[packet.target_name]
-      target.tlm_cnt += 1 if target
-      packet.received_count += 1
-      @identified_packet_callback.call(packet) if @identified_packet_callback
+        target = System.targets[packet.target_name]
+        target.tlm_cnt += 1 if target
+        packet.received_count += 1
+        @identified_packet_callback.call(packet) if @identified_packet_callback
 
+        # So we can release the mutex
+        packet = packet.clone
+      end
+      
       # Write to routers
       @interface.routers.each do |router|
         begin

data/lib/cosmos/tools/cmd_tlm_server/limits_groups_background_task.rb

@@ -86,7 +86,7 @@ module Cosmos
       return if @sleeper.sleep(@initial_delay)
       loop do
         start = Time.now
-        check_methods.each {|method| self.send(method.intern) }
+        check_methods.each {|method| self.public_send(method.intern) }
         now = Time.now
         @status = "#{now.formatted}: Checking groups took #{now - start}s"
         sleep_time = @task_delay - (now - start)

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -973,8 +973,10 @@ module Cosmos
                 if debug_text =~ /^@\S+$/ || @script_binding.local_variables.include?(debug_text.to_sym)
                   debug_text = "puts #{debug_text}" # Automatically add puts to print it
                 end
+                # Fortify: Dynamic Code Evaluation: Code Injection
                 eval(debug_text, @script_binding, 'debug', 1)
               else
+                # Fortify: Dynamic Code Evaluation: Code Injection
                 Object.class_eval(debug_text, 'debug', 1)
               end
               handle_output_io()
@@ -1489,7 +1491,7 @@ module Cosmos
               @@output_thread = nil
             end
 
-            @script.setReadOnly(false)
+            @script.setReadOnly(false) unless @script.read_only
             @script.stop_highlight unless uncaught_exception
             select_tab_and_destroy_tabs_after_index(0)
             remove_tabs()
@@ -1722,7 +1724,8 @@ module Cosmos
         @active_script.setPlainText(data)
       end
       mark_breakpoints(filename)
-
+      @active_script.read_only = !File.writable?(filename)
+      @active_script.setReadOnly(@active_script.read_only)
       @active_script.stop_highlight
     end
 

data/lib/cosmos/tools/test_runner/test.rb

@@ -176,7 +176,7 @@ module Cosmos
             end
           end
 
-          object.send(method_name)
+          object.public_send(method_name)
           result.result = :PASS
 
           if defined? ScriptRunnerFrame

data/lib/cosmos/tools/test_runner/test_runner.rb

@@ -865,13 +865,13 @@ module Cosmos
             suite = CustomTestSuite.new
             begin
               # Remove any previously defined suite setup methods
-              CustomTestSuite.send(:remove_method, :setup)
+              CustomTestSuite.public_send(:remove_method, :setup)
             rescue NameError
               # NameError is raised if no setup method was defined
             end
             begin
               # Remove any previously defined suite teardown methods
-              CustomTestSuite.send(:remove_method, :teardown)
+              CustomTestSuite.public_send(:remove_method, :teardown)
             rescue NameError
               # NameError is raised if no teardown method was defined
             end
@@ -884,7 +884,7 @@ module Cosmos
                   inst = @@test_suites.detect {|my_suite| my_suite.class.to_s == suite_node.text}
                   # Create a lambda which will call that one setup method
                   body = lambda { inst.setup }
-                  CustomTestSuite.send(:define_method, :setup, &body)
+                  CustomTestSuite.public_send(:define_method, :setup, &body)
                 end
                 if test_node.text == 'teardown'
                   cur_suite.teardown = true
@@ -892,7 +892,7 @@ module Cosmos
                   inst = @@test_suites.detect {|my_suite| my_suite.class.to_s == suite_node.text}
                   # Create a lambda which will call that one teardown method
                   body = lambda { inst.teardown}
-                  CustomTestSuite.send(:define_method, :teardown, &body)
+                  CustomTestSuite.public_send(:define_method, :teardown, &body)
                 end
               end
 

data/lib/cosmos/tools/tlm_extractor/tlm_extractor.rb

@@ -455,7 +455,7 @@ module Cosmos
     def self.post_options_parsed_hook(options)
       if options.input_files or options.dart
         normalize_config_options(options)
-        
+
         # Process config file
         raise "Configuration File must be specified for command line processing" unless options.config_file
 
@@ -675,7 +675,7 @@ module Cosmos
                 process_args = [batch_name, @input_filenames, @log_dir, output_extension, @batch_filenames, @packet_log_frame.time_start, @packet_log_frame.time_end]
               end
 
-              @tlm_extractor_processor.send(process_method, *process_args) do |input_file_index, packet_count, file_progress|
+              @tlm_extractor_processor.public_send(process_method, *process_args) do |input_file_index, packet_count, file_progress|
                 # Handle Cancel
                 break if @cancel
 
@@ -760,7 +760,7 @@ module Cosmos
                 process_args = [batch_name, @log_dir, output_extension, @batch_filenames, @packet_log_frame.time_start, @packet_log_frame.time_end, @dart_meta_frame.meta_filters]
               end
 
-              @tlm_extractor_processor.send(process_method, *process_args) do |percentage, message|
+              @tlm_extractor_processor.public_send(process_method, *process_args) do |percentage, message|
                 # Handle Cancel
                 break if @cancel
                 progress_dialog.append_text(message)

data/lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb

@@ -61,6 +61,8 @@ module Cosmos
     end
 
     def eval_str(string_to_eval)
+      # Fortify: Dynamic Code Evaluation: Code Injection
+      # TODO: Not sure how to sanitize this string
       @screen.instance_eval(string_to_eval)
     end
 

data/lib/cosmos/top_level.rb

@@ -397,7 +397,7 @@ module Cosmos
   # @param hashing_algorithm [String] Hashing algorithm to use
   # @return [Digest::<algorithm>] The hashing sum object
   def self.hash_files(filenames, additional_data = nil, hashing_algorithm = 'MD5')
-    digest = Digest.const_get(hashing_algorithm).send('new')
+    digest = Digest.const_get(hashing_algorithm).public_send('new')
 
     Cosmos.set_working_dir do
       filenames.each do |filename|

data/lib/cosmos/utilities/simulated_target.rb

@@ -37,7 +37,7 @@ module Cosmos
       @tlm_packets.each do |name, packet|
         ids = packet.id_items
         ids.each do |id|
-          packet.send((id.name + '=').to_sym, id.id_value)
+          packet.public_send((id.name + '=').to_sym, id.id_value)
         end
       end
 

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.5.0'
+COSMOS_VERSION = '4.5.1'
 module Cosmos
   module Version
     MAJOR = '4'
     MINOR = '5'
-    PATCH = '0'
-    BUILD = '627198e20200543f157cc4c2ffde5d7df5180ae2'
+    PATCH = '1'
+    BUILD = 'cb4647f6e93fcfb1dd38500288ecf5e1a6f79c76'
   end
-  VERSION = '4.5.0'
+  VERSION = '4.5.1'
 end

data/spec/core_ext/class_spec.rb

@@ -31,6 +31,60 @@ describe Class do
       my = MyClass.new
       expect(MyClass.test).to eql "Test"
       expect(my.test).to eql "Test"
+      # No accessor methods are created
+      expect { my.test = "Blah" }.to raise_error(NoMethodError)
+    end
+
+    it "does not allow arbitrary code" do
+      expect {
+        class MyClass
+          instance_attr_reader "test;puts 'HI'"
+        end
+      }.to raise_error(ArgumentError)
+
+      expect {
+        class MyClass
+          instance_attr_reader "test\nputs 'HI'"
+        end
+      }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "instance_attr_accessor" do
+    it "adds instance attribute readers for class variables" do
+      class MyClass
+        instance_attr_accessor :test
+        @@instance = nil
+        def self.instance
+          @@instance ||= self.new
+          return @@instance
+        end
+        def initialize
+          @test = "Test"
+          @@instance = self
+        end
+      end
+
+      my = MyClass.new
+      expect(MyClass.test).to eql "Test"
+      expect(my.test).to eql "Test"
+      my.test = "Blah"
+      expect(MyClass.test).to eql "Blah"
+      expect(my.test).to eql "Blah"
+    end
+
+    it "does not allow arbitrary code" do
+      expect {
+        class MyClass
+          instance_attr_accessor "test;puts 'HI'"
+        end
+      }.to raise_error(ArgumentError)
+
+      expect {
+        class MyClass
+          instance_attr_accessor "test\nputs 'HI'"
+        end
+      }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/interfaces/serial_interface_spec.rb

@@ -9,14 +9,11 @@
 # attribution addendums as found in the LICENSE.txt
 
 if RUBY_ENGINE == 'ruby' or Gem.win_platform?
-
   require 'spec_helper'
   require 'cosmos/interfaces/serial_interface'
 
   module Cosmos
-
-    describe SerialInterface do
-
+    describe SerialInterface, :if => `change port /query 2>&1` !~ /No serial ports/ do
       describe "initialize" do
         it "initializes the instance variables" do
           i = SerialInterface.new('COM1','COM1','9600','NONE','1','0','0','burst')
@@ -66,5 +63,4 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
       end
     end
   end
-
 end

data/spec/packet_logs/packet_log_reader_spec.rb

@@ -206,7 +206,7 @@ module Cosmos
         end
 
         # Corrupt the second config
-        second_config_path = System.instance.send(:find_configuration, second_config_name)
+        second_config_path = System.instance.public_send(:find_configuration, second_config_name)
         md5 = File.basename(second_config_path, '.*')
         Zip::File.open(second_config_path) do |zip|
           zip.file.rename(File.join(md5, 'system.txt'), File.join(md5, 'system2.txt'))

data/spec/system/system_spec.rb

@@ -359,7 +359,7 @@ module Cosmos
           expect(System.telemetry.packets('SYSTEM').keys).not_to include "TEST2"
 
           # Now remove system.txt from the third configuration and try to load it again to cause an error
-          #third_config_path = System.instance.send(:find_configuration, third_config_name)
+          #third_config_path = System.instance.public_send(:find_configuration, third_config_name)
           #FileUtils.mv File.join(third_config_path, 'system.txt'), File.join(third_config_path, 'system2.txt')
           #result, err = System.load_configuration(third_config_name)
           #expect(result).to eql original_config_name

data/spec/tools/cmd_tlm_server/api_spec.rb

@@ -102,12 +102,12 @@ DOC
     end
 
     def test_cmd_unknown(method)
-      expect { @api.send(method,"BLAH COLLECT with TYPE NORMAL") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST UNKNOWN with TYPE NORMAL") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST COLLECT with BLAH NORMAL") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"BLAH","COLLECT","TYPE"=>"NORMAL") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST","UNKNOWN","TYPE"=>"NORMAL") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST","COLLECT","BLAH"=>"NORMAL") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"BLAH COLLECT with TYPE NORMAL") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST UNKNOWN with TYPE NORMAL") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST COLLECT with BLAH NORMAL") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"BLAH","COLLECT","TYPE"=>"NORMAL") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST","UNKNOWN","TYPE"=>"NORMAL") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST","COLLECT","BLAH"=>"NORMAL") }.to raise_error(/does not exist/)
     end
 
     describe "cmd" do
@@ -571,12 +571,12 @@ DOC
     end
 
     def test_tlm_unknown(method)
-      expect { @api.send(method,"BLAH HEALTH_STATUS COLLECTS") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST UNKNOWN COLLECTS") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST HEALTH_STATUS BLAH") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"BLAH","HEALTH_STATUS","COLLECTS") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST","UNKNOWN","COLLECTS") }.to raise_error(/does not exist/)
-      expect { @api.send(method,"INST","HEALTH_STATUS","BLAH") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"BLAH HEALTH_STATUS COLLECTS") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST UNKNOWN COLLECTS") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST HEALTH_STATUS BLAH") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"BLAH","HEALTH_STATUS","COLLECTS") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST","UNKNOWN","COLLECTS") }.to raise_error(/does not exist/)
+      expect { @api.public_send(method,"INST","HEALTH_STATUS","BLAH") }.to raise_error(/does not exist/)
     end
 
     describe "tlm" do

data/spec/tools/cmd_tlm_server/background_tasks_spec.rb

@@ -165,7 +165,7 @@ module Cosmos
           expect(running_threads.length).to eql(2)
           expect(bt.instance_variable_get("@threads").length).to eq 1
           expect(bt.instance_variable_get("@threads")[0].alive?).to eq true
-          sleep 1.1 # Allow the thread to crash
+          sleep 2 # Allow the thread to crash
           expect(running_threads.length).to eql(1)
           expect(bt.instance_variable_get("@threads")[0]).to be_nil
           expect(stdout.string).to match("unexpectedly died")
@@ -178,7 +178,7 @@ module Cosmos
           expect(running_threads.length).to eql(2)
           expect(bt.instance_variable_get("@threads").length).to eq 1
           expect(bt.instance_variable_get("@threads")[0].alive?).to eq true
-          sleep 1.1 # Allow the thread to crash
+          sleep 2 # Allow the thread to crash
           expect(running_threads.length).to eql(1)
           expect(bt.instance_variable_get("@threads")[0]).to be_nil
           expect(stdout.string).to match("unexpectedly died")