- Rework finished

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

7 files changed, 55 insertions, 9 deletions

diff --git a/tests/plugins/websockets/configs/.rr-websockets-memory-allow.yaml b/tests/plugins/websockets/configs/.rr-websockets-allow.yaml
index f81e13e3..e6c43857 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-memory-allow.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-allow.yaml
@@ -9,7 +9,7 @@ server:
   relay_timeout: "20s"
 
 http:
-  address: 127.0.0.1:11113
+  address: 127.0.0.1:41278
   max_request_size: 1024
   middleware: [ "websockets" ]
   trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
diff --git a/tests/plugins/websockets/configs/.rr-websockets-redis-memory-local.yaml b/tests/plugins/websockets/configs/.rr-websockets-allow2.yaml
index a077bf9e..d537a80b 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-redis-memory-local.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-allow2.yaml
@@ -2,14 +2,14 @@ rpc:
   listen: tcp://127.0.0.1:6001
 
 server:
-  command: "php ../../psr-worker-bench.php"
+  command: "php ../../worker-ok.php"
   user: ""
   group: ""
   relay: "pipes"
   relay_timeout: "20s"
 
 http:
-  address: 127.0.0.1:13235
+  address: 127.0.0.1:41270
   max_request_size: 1024
   middleware: [ "websockets" ]
   trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
@@ -19,10 +19,15 @@ http:
     allocate_timeout: 60s
     destroy_timeout: 60s
 
+redis:
+  addrs:
+    - "localhost:6379"
 
 broadcast:
    test:
-  driver: memory
+    driver: redis
+    addrs:
+      - "localhost:6379"
 
 websockets:
   broker: test
@@ -31,7 +36,7 @@ websockets:
 
 logs:
   mode: development
-  level: debug
+  level: error
 
 endure:
   grace_period: 120s
diff --git a/tests/plugins/websockets/configs/.rr-websockets-redis-no-section.yaml b/tests/plugins/websockets/configs/.rr-websockets-broker-no-section.yaml
index d80993f2..ada23845 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-redis-no-section.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-broker-no-section.yaml
@@ -19,6 +19,9 @@ http:
     allocate_timeout: 60s
     destroy_timeout: 60s
 
+broadcast:
+  test1:
+    driver: no
 
 websockets:
   broker: test
diff --git a/tests/plugins/websockets/configs/.rr-websockets-memory-deny.yaml b/tests/plugins/websockets/configs/.rr-websockets-deny.yaml
index decb7dcf..594a746d 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-memory-deny.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-deny.yaml
@@ -9,7 +9,7 @@ server:
   relay_timeout: "20s"
 
 http:
-  address: 127.0.0.1:11112
+  address: 127.0.0.1:15587
   max_request_size: 1024
   middleware: [ "websockets" ]
   trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
diff --git a/tests/plugins/websockets/configs/.rr-websockets-deny2.yaml b/tests/plugins/websockets/configs/.rr-websockets-deny2.yaml
new file mode 100644
index 00000000..4deea30a
--- /dev/null
+++ b/tests/plugins/websockets/configs/.rr-websockets-deny2.yaml
@@ -0,0 +1,40 @@
+rpc:
+  listen: tcp://127.0.0.1:6001
+
+server:
+  command: "php ../../worker-deny.php"
+  user: ""
+  group: ""
+  relay: "pipes"
+  relay_timeout: "20s"
+
+http:
+  address: 127.0.0.1:15588
+  max_request_size: 1024
+  middleware: [ "websockets" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  pool:
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
+
+broadcast:
+  test:
+    driver: redis
+    addrs:
+      - "localhost:6379"
+
+websockets:
+  broker: test
+  allowed_origin: "*"
+  path: "/ws"
+
+logs:
+  mode: development
+  level: error
+
+endure:
+  grace_period: 120s
+  print_graph: false
+  log_level: error
diff --git a/tests/plugins/websockets/configs/.rr-websockets-init.yaml b/tests/plugins/websockets/configs/.rr-websockets-init.yaml
index b6882d84..14472f8a 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-init.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-init.yaml
@@ -25,9 +25,7 @@ redis:
 
 broadcast:
   default:
-    driver: redis
-    addrs:
-      - "localhost:6379"
+    driver: memory
 
 websockets:
   broker: default
diff --git a/tests/plugins/websockets/configs/.rr-websockets-memory-stop.yaml b/tests/plugins/websockets/configs/.rr-websockets-stop.yaml
index 5377aef2..5377aef2 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-memory-stop.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-stop.yaml