chore: added E2E test for logging category

chore: changed e2e test to use IntegrationLogs chore: updated e2e chore: removed unnecessary code, fixed typos
realMartinez · Mar 25, 2024 · f472fcc · f472fcc
1 parent 6ff792c
commit f472fcc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
@@ -216,6 +216,8 @@ func TestJsonLoggingTrait(t *testing.T) {
 	assert.True(t, logFormatIsNotDefault)
 	assert.NotEmpty(t, env.ExecutedTraits)
 }
+<<<<<<< HEAD
+=======
 
 func TestSingleLoggingCategory(t *testing.T) {
 	env := createLoggingTestEnv(t, true, true, false, "TRACE", "%d{HH:mm:ss} %-5p (%t) %s%e%n", map[string]string{})
@@ -254,3 +256,4 @@ func TestLoggingCategories(t *testing.T) {
 	}
 
 }
+>>>>>>> 629f0d84f (chore: added E2E test for logging category)