Copied specs from old "pipeline__id_log_spec.rb" renamed to "pipeline…

…_log_spec.rb"
elastic · Sep 20, 2019 · 356cef2 · 356cef2
1 parent 84be866
commit 356cef2
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 51 deletions.
diff --git a/qa/integration/specs/pipeline_log_spec.rb b/qa/integration/specs/pipeline_log_spec.rb
@@ -73,6 +73,57 @@
     expect(IO.read(plainlog_file) =~ /Starting pipeline.*"pipeline.sources"=>\["#{initial_config_file}"\]/).to be > 0
   end
 
+  it "should separate pipeline output in its own log file" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name,
+      "pipeline.separate_logs" => true
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1" , "-e", config)
+    wait_logstash_process_terminate()
+
+    pipeline_log_file = "#{temp_dir}/pipeline_#{pipeline_name}.log"
+    expect(File.exists?(pipeline_log_file)).to be true
+    content = IO.read(pipeline_log_file)
+    expect(content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be > 0
+
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exists?(plainlog_file)).to be true
+    plaing_log_content = IO.read(plainlog_file)
+    expect(plaing_log_content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be_nil
+  end
+
+  it "should not create separate pipelines log files if not enabled" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name,
+      "pipeline.separate_logs" => false
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1" , "-e", config)
+    wait_logstash_process_terminate()
+
+    pipeline_log_file = "#{temp_dir}/pipeline_#{pipeline_name}.log"
+    expect(File.exists?(pipeline_log_file)).to be false
+
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exists?(plainlog_file)).to be true
+    plaing_log_content = IO.read(plainlog_file)
+    expect(plaing_log_content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be > 0
+  end
+
+  @private
+  def wait_logstash_process_terminate
+    num_retries = 100
+    try(num_retries) do
+      expect(@ls.exited?).to be(true)
+    end
+    expect(@ls.exit_code).to be >= 0
+  end
+
   @private
   def wait_logstash_process_terminate
     num_retries = 100

diff --git a/qa/integration/specs/slowlog_spec.rb b/qa/integration/specs/slowlog_spec.rb
@@ -43,55 +43,4 @@
     expect(File.exists?(slowlog_file)).to be true
     expect(IO.read(slowlog_file).split("\n").size).to be >= 1
   end
-
-  it "should separate pipeline output in its own log file" do
-    pipeline_name = "custom_pipeline"
-    settings = {
-      "path.logs" => temp_dir,
-      "pipeline.id" => pipeline_name,
-      "pipeline.separate_logs" => true
-    }
-    IO.write(@ls.application_settings_file, settings.to_yaml)
-    @ls.spawn_logstash("-w", "1" , "-e", config)
-    wait_logstash_process_terminate()
-
-    pipeline_log_file = "#{temp_dir}/pipeline_#{pipeline_name}.log"
-    expect(File.exists?(pipeline_log_file)).to be true
-    content = IO.read(pipeline_log_file)
-    expect(content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be > 0
-
-    plainlog_file = "#{temp_dir}/logstash-plain.log"
-    expect(File.exists?(plainlog_file)).to be true
-    plaing_log_content = IO.read(plainlog_file)
-    expect(plaing_log_content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be_nil
-  end
-
-  it "should not create separate pipelines log files if not enabled" do
-    pipeline_name = "custom_pipeline"
-    settings = {
-      "path.logs" => temp_dir,
-      "pipeline.id" => pipeline_name,
-      "pipeline.separate_logs" => false
-    }
-    IO.write(@ls.application_settings_file, settings.to_yaml)
-    @ls.spawn_logstash("-w", "1" , "-e", config)
-    wait_logstash_process_terminate()
-
-    pipeline_log_file = "#{temp_dir}/pipeline_#{pipeline_name}.log"
-    expect(File.exists?(pipeline_log_file)).to be false
-
-    plainlog_file = "#{temp_dir}/logstash-plain.log"
-    expect(File.exists?(plainlog_file)).to be true
-    plaing_log_content = IO.read(plainlog_file)
-    expect(plaing_log_content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be > 0
-  end
-
-  @private
-  def wait_logstash_process_terminate
-    num_retries = 100
-    try(num_retries) do
-      expect(@ls.exited?).to be(true)
-    end
-    expect(@ls.exit_code).to be >= 0
-  end
 end