Update go.mod dependencies to the most recent version.

Fix tests according to the new mocks.

Signed-off-by: Valery Piashchynski <[email protected]>

5 files changed, 35 insertions, 49 deletions

diff --git a/tests/plugins/reload/configs/.rr-reload-2.yaml b/tests/plugins/reload/configs/.rr-reload-2.yaml
index 3881d4d9..fd1fe417 100644
--- a/tests/plugins/reload/configs/.rr-reload-2.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-2.yaml
@@ -1,16 +1,10 @@
 server:
   command: php ../../psr-worker-bench.php
-  user: ''
-  group: ''
-  env:
-    RR_HTTP: 'true'
   relay: pipes
   relay_timeout: 20s
 http:
   address: '127.0.0.1:27388'
   max_request_size: 1024
-  middleware:
-    - ''
   uploads:
     forbid:
       - .php
@@ -31,7 +25,7 @@ http:
     destroy_timeout: 60s
 logs:
   mode: development
-  level: error
+  level: debug
 reload:
   interval: 2s
   patterns:
diff --git a/tests/plugins/reload/configs/.rr-reload-3.yaml b/tests/plugins/reload/configs/.rr-reload-3.yaml
index cdd32d20..36af2693 100644
--- a/tests/plugins/reload/configs/.rr-reload-3.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-3.yaml
@@ -1,16 +1,10 @@
 server:
   command: php ../../psr-worker-bench.php
-  user: ''
-  group: ''
-  env:
-    RR_HTTP: 'true'
   relay: pipes
   relay_timeout: 20s
 http:
   address: '127.0.0.1:37388'
   max_request_size: 1024
-  middleware:
-    - ''
   uploads:
     forbid:
       - .php
@@ -31,9 +25,9 @@ http:
     destroy_timeout: 60s
 logs:
   mode: development
-  level: error
+  level: debug
 reload:
-  interval: 2s
+  interval: 1s
   patterns:
     - .txt
   services:
diff --git a/tests/plugins/reload/configs/.rr-reload-4.yaml b/tests/plugins/reload/configs/.rr-reload-4.yaml
index c499ec90..ceec11c4 100644
--- a/tests/plugins/reload/configs/.rr-reload-4.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-4.yaml
@@ -1,16 +1,10 @@
 server:
   command: php ../../psr-worker-bench.php
-  user: ''
-  group: ''
-  env:
-    RR_HTTP: 'true'
   relay: pipes
   relay_timeout: 20s
 http:
   address: '127.0.0.1:22766'
   max_request_size: 1024
-  middleware:
-    - ''
   uploads:
     forbid:
       - .php
@@ -31,9 +25,10 @@ http:
     destroy_timeout: 60s
 logs:
   mode: development
-  level: error
+  level: debug
+
 reload:
-  interval: 2s
+  interval: 1s
   patterns:
     - .aaa
   services:
diff --git a/tests/plugins/reload/configs/.rr-reload.yaml b/tests/plugins/reload/configs/.rr-reload.yaml
index b68430ef..5048ddda 100644
--- a/tests/plugins/reload/configs/.rr-reload.yaml
+++ b/tests/plugins/reload/configs/.rr-reload.yaml
@@ -1,16 +1,10 @@
 server:
   command: php ../../psr-worker-bench.php
-  user: ''
-  group: ''
-  env:
-    RR_HTTP: 'true'
   relay: pipes
   relay_timeout: 20s
 http:
   address: '127.0.0.1:22388'
   max_request_size: 1024
-  middleware:
-    - ''
   uploads:
     forbid:
       - .php
@@ -31,7 +25,7 @@ http:
     destroy_timeout: 60s
 logs:
   mode: development
-  level: error
+  level: debug
 reload:
   interval: 1s
   patterns:
diff --git a/tests/plugins/reload/reload_plugin_test.go b/tests/plugins/reload/reload_plugin_test.go
index 04c9849f..b0841b0b 100644
--- a/tests/plugins/reload/reload_plugin_test.go
+++ b/tests/plugins/reload/reload_plugin_test.go
@@ -49,11 +49,9 @@ func TestReloadInit(t *testing.T) {
 
 	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).AnyTimes()
 	mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).AnyTimes()
-	mockLogger.EXPECT().Debug("http handler response received", "elapsed", gomock.Any(), "remote address", "127.0.0.1").Times(1)
-	mockLogger.EXPECT().Debug("file was created", "path", gomock.Any(), "name", "file.txt", "size", gomock.Any()).Times(2)
-	mockLogger.EXPECT().Debug("file was added to watcher", "path", gomock.Any(), "name", "file.txt", "size", gomock.Any()).Times(2)
+	mockLogger.EXPECT().Debug("file was created", "path", gomock.Any(), "name", "file.txt", "size", gomock.Any()).MinTimes(1)
+	mockLogger.EXPECT().Debug("file was added to watcher", "path", gomock.Any(), "name", "file.txt", "size", gomock.Any()).Times(1)
 	mockLogger.EXPECT().Info("HTTP plugin got restart request. Restarting...").Times(1)
-	mockLogger.EXPECT().Info("scan command", gomock.Any()).Times(1)
 	mockLogger.EXPECT().Info("HTTP workers Pool successfully restarted").Times(1)
 	mockLogger.EXPECT().Info("HTTP handler listeners successfully re-added").Times(1)
 	mockLogger.EXPECT().Info("HTTP plugin successfully restarted").Times(1)
@@ -110,10 +108,12 @@ func TestReloadInit(t *testing.T) {
 		}
 	}()
 
+	time.Sleep(time.Second * 3)
 	t.Run("ReloadTestInit", reloadTestInit)
-
+	time.Sleep(time.Second * 3)
 	stopCh <- struct{}{}
 	wg.Wait()
+
 	assert.NoError(t, freeResources(testDir))
 }
 
@@ -142,16 +142,14 @@ func TestReloadHugeNumberOfFiles(t *testing.T) {
 	controller := gomock.NewController(t)
 	mockLogger := mocks.NewMockLogger(controller)
 
-	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1)
+	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).AnyTimes()
 	mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).AnyTimes()
 	mockLogger.EXPECT().Debug("file added to the list of removed files", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).AnyTimes()
-	mockLogger.EXPECT().Debug("http handler response received", "elapsed", gomock.Any(), "remote address", "127.0.0.1").Times(1)
 	mockLogger.EXPECT().Debug("file was created", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(1)
 	mockLogger.EXPECT().Debug("file was updated", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(1)
 	mockLogger.EXPECT().Debug("file was added to watcher", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(1)
 	mockLogger.EXPECT().Info("HTTP plugin got restart request. Restarting...").MinTimes(1)
 	mockLogger.EXPECT().Info("HTTP workers Pool successfully restarted").MinTimes(1)
-	mockLogger.EXPECT().Info("scan command", gomock.Any()).Times(1)
 	mockLogger.EXPECT().Info("HTTP handler listeners successfully re-added").MinTimes(1)
 	mockLogger.EXPECT().Info("HTTP plugin successfully restarted").MinTimes(1)
 	mockLogger.EXPECT().Error(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() // placeholder for the workerlogerror
@@ -207,8 +205,10 @@ func TestReloadHugeNumberOfFiles(t *testing.T) {
 		}
 	}()
 
+	time.Sleep(time.Second * 3)
 	t.Run("ReloadTestHugeNumberOfFiles", reloadHugeNumberOfFiles)
 	t.Run("ReloadRandomlyChangeFile", randomlyChangeFile)
+	time.Sleep(time.Second * 3)
 
 	stopCh <- struct{}{}
 	wg.Wait()
@@ -253,15 +253,13 @@ func TestReloadFilterFileExt(t *testing.T) {
 	controller := gomock.NewController(t)
 	mockLogger := mocks.NewMockLogger(controller)
 
-	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1)
+	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).AnyTimes()
 	mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).AnyTimes()
-	mockLogger.EXPECT().Debug("http handler response received", "elapsed", gomock.Any(), "remote address", "127.0.0.1").Times(1)
 	mockLogger.EXPECT().Debug("file was created", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(100)
 	mockLogger.EXPECT().Debug("file was added to watcher", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(1)
 	mockLogger.EXPECT().Debug("file added to the list of removed files", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).AnyTimes()
 	mockLogger.EXPECT().Info("HTTP plugin got restart request. Restarting...").Times(1)
 	mockLogger.EXPECT().Info("HTTP workers Pool successfully restarted").Times(1)
-	mockLogger.EXPECT().Info("scan command", gomock.Any()).AnyTimes()
 	mockLogger.EXPECT().Info("HTTP handler listeners successfully re-added").MinTimes(1)
 	mockLogger.EXPECT().Info("HTTP plugin successfully restarted").Times(1)
 	mockLogger.EXPECT().Error(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() // placeholder for the workerlogerror
@@ -317,8 +315,10 @@ func TestReloadFilterFileExt(t *testing.T) {
 		}
 	}()
 
+	time.Sleep(time.Second * 3)
 	t.Run("ReloadMakeFiles", reloadMakeFiles)
 	t.Run("ReloadFilteredExt", reloadFilteredExt)
+	time.Sleep(time.Second * 3)
 
 	stopCh <- struct{}{}
 	wg.Wait()
@@ -382,16 +382,14 @@ func TestReloadCopy100(t *testing.T) {
 	controller := gomock.NewController(t)
 	mockLogger := mocks.NewMockLogger(controller)
 	//
-	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1)
+	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).AnyTimes()
 	mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).AnyTimes()
-	mockLogger.EXPECT().Debug("http handler response received", "elapsed", gomock.Any(), "remote address", "127.0.0.1").Times(1)
 	mockLogger.EXPECT().Debug("file was created", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(50)
 	mockLogger.EXPECT().Debug("file was added to watcher", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(50)
 	mockLogger.EXPECT().Debug("file added to the list of removed files", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(50)
 	mockLogger.EXPECT().Debug("file was removed from watcher", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(50)
 	mockLogger.EXPECT().Debug("file was updated", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(50)
 	mockLogger.EXPECT().Info("HTTP plugin got restart request. Restarting...").AnyTimes()
-	mockLogger.EXPECT().Info("scan command", gomock.Any()).Times(1)
 	mockLogger.EXPECT().Info("HTTP workers Pool successfully restarted").MinTimes(1)
 	mockLogger.EXPECT().Info("HTTP handler listeners successfully re-added").MinTimes(1)
 	mockLogger.EXPECT().Info("HTTP plugin successfully restarted").MinTimes(1)
@@ -460,17 +458,21 @@ func TestReloadCopy100(t *testing.T) {
 	// 3
 	// Recursive
 
+	time.Sleep(time.Second * 3)
 	t.Run("ReloadMake100Files", reloadMake100Files)
 	t.Run("ReloadCopyFiles", reloadCopyFiles)
 	t.Run("ReloadRecursiveDirsSupport", copyFilesRecursive)
 	t.Run("RandomChangesInRecursiveDirs", randomChangesInRecursiveDirs)
 	t.Run("RemoveFilesSupport", removeFilesSupport)
 	t.Run("ReloadMoveSupport", reloadMoveSupport)
+	time.Sleep(time.Second * 3)
 
 	assert.NoError(t, freeResources(testDir))
 	assert.NoError(t, freeResources(testCopyToDir))
 	assert.NoError(t, freeResources(dir1))
 
+	time.Sleep(time.Second * 3)
+
 	stopCh <- struct{}{}
 	wg.Wait()
 }
@@ -668,11 +670,14 @@ func TestReloadNoRecursion(t *testing.T) {
 	mockLogger := mocks.NewMockLogger(controller)
 
 	// http server should not be restarted. all event from wrong file extensions should be skipped
-	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1)
-	mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).MinTimes(1)
-	mockLogger.EXPECT().Debug("http handler response received", "elapsed", gomock.Any(), "remote address", "127.0.0.1").Times(1)
+	mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).AnyTimes()
+	mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).AnyTimes()
+	mockLogger.EXPECT().Debug("file was removed from watcher", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(1)
 	mockLogger.EXPECT().Debug("file added to the list of removed files", "path", gomock.Any(), "name", gomock.Any(), "size", gomock.Any()).MinTimes(1)
-	mockLogger.EXPECT().Info("scan command", gomock.Any()).Times(1)
+	mockLogger.EXPECT().Info("HTTP plugin got restart request. Restarting...").MinTimes(1)
+	mockLogger.EXPECT().Info("HTTP workers Pool successfully restarted").MinTimes(1)
+	mockLogger.EXPECT().Info("HTTP handler listeners successfully re-added").MinTimes(1)
+	mockLogger.EXPECT().Info("HTTP plugin successfully restarted").MinTimes(1)
 	mockLogger.EXPECT().Error(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() // placeholder for the workerlogerror
 
 	err = cont.RegisterAll(
@@ -726,13 +731,17 @@ func TestReloadNoRecursion(t *testing.T) {
 		}
 	}()
 
+	time.Sleep(time.Second * 3)
 	t.Run("ReloadMakeFiles", reloadMakeFiles) // make files in the testDir
+	time.Sleep(time.Second * 3)
 	t.Run("ReloadCopyFilesRecursive", reloadCopyFiles)
+	time.Sleep(time.Second * 3)
+	assert.NoError(t, freeResources(testDir))
+	time.Sleep(time.Second * 3)
 
 	stopCh <- struct{}{}
 	wg.Wait()
 
-	assert.NoError(t, freeResources(testDir))
 	assert.NoError(t, freeResources(testCopyToDir))
 	assert.NoError(t, freeResources(dir1))
 }