switch from custom dependency handling to strict requires in test helpers and enhance worker initialization logic

Author: NguyenHoangSon96

apis/influxdb-client-apis.gemspec

@@ -50,7 +50,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '5.15.0'
-  spec.add_development_dependency 'minitest-reporters', '~> 1.4'
+  spec.add_development_dependency 'minitest-ci', '~> 3.4'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 0.66.0'
   spec.add_development_dependency 'simplecov-cobertura', '~> 1.4.2'

apis/test/test_helper.rb

@@ -33,7 +33,6 @@
 require 'influxdb-client'
 
 require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! unless ENV['RM_INFO']
+require 'minitest/ci'
 
 require 'webmock/minitest'

lib/influxdb2/client/write_api.rb

@@ -249,7 +249,15 @@ def hash
     def _worker
       return nil unless @write_options.write_type == WriteType::BATCHING
 
-      @worker || WORKER_MUTEX.synchronize { @worker ||= Worker.new(self, @write_options) }
+      return @worker if @worker
+
+      WORKER_MUTEX.synchronize do
+        # this return is necessary because the previous mutex holder
+        # might have already assigned the @worker
+        return @worker if @worker
+
+        @worker = Worker.new(self, @write_options)
+      end
     end
 
     def _add_default_tags(data)

test/test_helper.rb

@@ -18,69 +18,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-begin
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'lib/influxdb2/client/models/'
-    add_filter 'test/influxdb'
-  end
-rescue LoadError
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'lib/influxdb2/client/models/'
+  add_filter 'test/influxdb'
 end
 
-begin
-  if ENV['CI'] == 'true'
-    require 'simplecov-cobertura'
-    SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
-  end
-rescue LoadError
+if ENV['CI'] == 'true'
+  require 'simplecov-cobertura'
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 end
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'influxdb-client'
 
 require 'minitest/autorun'
-begin
-  require 'minitest/ci'
-rescue LoadError
-end
-
-begin
-  require 'webmock/minitest'
-rescue LoadError
-end
-
-if !defined? WebMock
-  module WebMock
-    def self.disable_net_connect!(*_args); end
-    def self.allow_net_connect!(*_args); end
-    def self.reset!(*_args); end
-  end
+require 'minitest/ci'
 
-  def stub_request(*_args)
-    Class.new do
-      def self.to_return(*_args)
-        self
-      end
-
-      def self.then
-        self
-      end
-    end
-  end
-
-  def assert_requested(*_args)
-  end
-
-  class MiniTest::Test
-    def before_setup
-      super
-      skip 'WebMock is required for this test' if self.class.name != 'QueryApiIntegrationTest' &&
-                                                 self.class.name != 'DeleteApiIntegrationTest' &&
-                                                 self.class.name != 'WriteApiIntegrationTest' &&
-                                                 self.class.name != 'ClientTest'
-    end
-  end
-end
+require 'webmock/minitest'
 
 class MockLogger
   attr_accessor :messages