From 839d44d167abe522f5ad4b5ef6747404c47baaa5 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Wed, 25 Oct 2023 10:51:30 +0530
Subject: [PATCH 1/2] fix: consume default queue (#1249)

---
 compose.yaml                 | 4 ++--
 docs/development.md          | 3 +--
 docs/single-compose-setup.md | 4 ++--
 pwd.yml                      | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index d70590ad..75baa6b6 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -70,11 +70,11 @@ services:
 
   queue-short:
     <<: *backend_defaults
-    command: bench worker --queue short
+    command: bench worker --queue short,default
 
   queue-long:
     <<: *backend_defaults
-    command: bench worker --queue long
+    command: bench worker --queue long,default,short
 
   scheduler:
     <<: *backend_defaults
diff --git a/docs/development.md b/docs/development.md
index 3919b644..abe8d8d8 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -293,8 +293,7 @@ honcho start \
     watch \
     schedule \
     worker_short \
-    worker_long \
-    worker_default
+    worker_long
 ```
 
 Alternatively you can use the VSCode launch configuration "Honcho SocketIO Watch Schedule Worker" which launches the same command as above.
diff --git a/docs/single-compose-setup.md b/docs/single-compose-setup.md
index c489d102..aea2914c 100644
--- a/docs/single-compose-setup.md
+++ b/docs/single-compose-setup.md
@@ -8,8 +8,8 @@ This setup is a very simple single compose file that does everything to start re
 
 - backend, serves gunicorn backend
 - frontend, serves static assets through nginx frontend reverse proxies websocket and gunicorn.
-- queue-long, long rq worker.
-- queue-short, short rq worker.
+- queue-long, long default and short rq worker.
+- queue-short, default and short rq worker.
 - schedule, event scheduler.
 - websocket, socketio websocket for realtime communication.
 
diff --git a/pwd.yml b/pwd.yml
index f643efe0..fb1cd05e 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -119,7 +119,7 @@ services:
       - bench
       - worker
       - --queue
-      - long
+      - long,default,short
     volumes:
       - sites:/home/frappe/frappe-bench/sites
       - logs:/home/frappe/frappe-bench/logs
@@ -133,7 +133,7 @@ services:
       - bench
       - worker
       - --queue
-      - short
+      - short,default
     volumes:
       - sites:/home/frappe/frappe-bench/sites
       - logs:/home/frappe/frappe-bench/logs

From 122927662c6d45c8c0693518462866dc980111da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:26:01 +0530
Subject: [PATCH 2/2] chore(deps): bump pytest from 7.4.2 to 7.4.3 (#1251)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.2 to 7.4.3.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.2...7.4.3)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements-test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-test.txt b/requirements-test.txt
index 2a929edc..f9708e4b 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1 +1 @@
-pytest==7.4.2
+pytest==7.4.3