This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry-go-libs.git
commit b415c9b4a621a0f1d3d89177cfb3e51fce1832c2 Author: Karen Huddleston <[email protected]> AuthorDate: Tue Apr 16 15:18:05 2024 -0700 Fix existing tests DeepEqual was not working in logger tests. Likely because the underlying log library had a change. Just check the main values we care about. --- cluster/cluster_test.go | 2 +- gplog/gplog_test.go | 40 +++++++++++++++++----------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/cluster/cluster_test.go b/cluster/cluster_test.go index 38ea1a5..eb78bde 100644 --- a/cluster/cluster_test.go +++ b/cluster/cluster_test.go @@ -466,7 +466,7 @@ var _ = Describe("cluster/cluster tests", func() { testCluster.Executor = &cluster.GPDBExecutor{} output, err := testCluster.ExecuteLocalCommand(commandStr) - Expect(output).To(Equal("bash: some-non-existent-command: command not found\n")) + Expect(output).To(ContainSubstring("some-non-existent-command: command not found\n")) Expect(err.Error()).To(Equal("exit status 127")) }) }) diff --git a/gplog/gplog_test.go b/gplog/gplog_test.go index 7d387d4..918ac7d 100644 --- a/gplog/gplog_test.go +++ b/gplog/gplog_test.go @@ -5,7 +5,6 @@ import ( "io" "os" "os/user" - "reflect" "strings" "testing" "time" @@ -26,13 +25,13 @@ func TestGpLog(t *testing.T) { var _ = Describe("logger/log tests", func() { var ( - stdout *gbytes.Buffer - stderr *gbytes.Buffer - logfile *gbytes.Buffer - buffer *gbytes.Buffer - sampleLogger *gplog.GpLogger - fakeInfo os.FileInfo + stdout *gbytes.Buffer + stderr *gbytes.Buffer + logfile *gbytes.Buffer + buffer *gbytes.Buffer + fakeInfo os.FileInfo ) + const defaultLogFile = "testDir/gpAdminLogs/testProgram_20170101.log" BeforeEach(func() { err := os.MkdirAll("/tmp/log_dir", 0755) @@ -55,22 +54,22 @@ var _ = Describe("logger/log tests", func() { Describe("NewLogger", func() { Context("Setting logfile verbosity", func() { It("defaults to Debug if no argument is passed", func() { - gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, "testDir/gpAdminLogs/testProgram_20170101.log", + gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, defaultLogFile, gplog.LOGINFO, "testProgram")) Expect(gplog.GetLogFileVerbosity()).To(Equal(gplog.LOGDEBUG)) }) It("defaults to Debug if too many arguments are passed", func() { - gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, "testDir/gpAdminLogs/testProgram_20170101.log", + gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, defaultLogFile, gplog.LOGINFO, "testProgram", gplog.LOGINFO, gplog.LOGERROR)) Expect(gplog.GetLogFileVerbosity()).To(Equal(gplog.LOGDEBUG)) }) It("defaults to Debug if an invalid argument is passed", func() { - gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, "testDir/gpAdminLogs/testProgram_20170101.log", + gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, defaultLogFile, gplog.LOGINFO, "testProgram", 42)) Expect(gplog.GetLogFileVerbosity()).To(Equal(gplog.LOGDEBUG)) }) It("sets the logfile verbosity if a valid argument is passed", func() { - gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, "testDir/gpAdminLogs/testProgram_20170101.log", + gplog.SetLogger(gplog.NewLogger(os.Stdout, os.Stderr, buffer, defaultLogFile, gplog.LOGINFO, "testProgram", gplog.LOGINFO)) Expect(gplog.GetLogFileVerbosity()).To(Equal(gplog.LOGINFO)) }) @@ -78,28 +77,23 @@ var _ = Describe("logger/log tests", func() { }) Describe("InitializeLogging", func() { BeforeEach(func() { - sampleLogger = gplog.NewLogger(os.Stdout, os.Stderr, buffer, "testDir/gpAdminLogs/testProgram_20170101.log", - gplog.LOGINFO, "testProgram") gplog.SetLogger(nil) }) Context("Logger initialized with default log directory and Info log level", func() { It("creates a new logger writing to gpAdminLogs and sets utils.logger to this new logger", func() { gplog.InitializeLogging("testProgram", "") - newLogger := gplog.GetLogger() - if !reflect.DeepEqual(newLogger, sampleLogger) { - Fail(fmt.Sprintf("Created logger does not match sample logger:\n%v\n%v", newLogger, sampleLogger)) - } + Expect(gplog.GetLogFilePath()).To(Equal("testDir/gpAdminLogs/testProgram_20170101.log")) + Expect(gplog.GetVerbosity()).To(Equal(gplog.LOGINFO)) + Expect(gplog.GetLogFileVerbosity()).To(Equal(gplog.LOGDEBUG)) }) }) Context("Logger initialized with a specified log directory and Info log level", func() { It("creates a new logger writing to the specified log directory and sets utils.logger to this new logger", func() { - sampleLogger = gplog.NewLogger(os.Stdout, os.Stderr, buffer, "/tmp/log_dir/testProgram_20170101.log", - gplog.LOGINFO, "testProgram") + expectedFilePath := "/tmp/log_dir/testProgram_20170101.log" gplog.InitializeLogging("testProgram", "/tmp/log_dir") - newLogger := gplog.GetLogger() - if !reflect.DeepEqual(newLogger, sampleLogger) { - Fail(fmt.Sprintf("Created logger does not match sample logger:\n%v\n%v", newLogger, sampleLogger)) - } + Expect(gplog.GetLogFilePath()).To(Equal(expectedFilePath)) + Expect(gplog.GetVerbosity()).To(Equal(gplog.LOGINFO)) + Expect(gplog.GetLogFileVerbosity()).To(Equal(gplog.LOGDEBUG)) }) }) Context("Directory or log file does not exist or is not writable", func() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
