Merge pull request #5898: Misc pants-plugins/uses_services improvements

cognifloyd · web-flow · commit 7b443572c092 · 2023-02-14T11:42:28.000-06:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,7 +16,7 @@ Added
   to pants' use of PEX lockfiles. This is not a user-facing addition.
   #5778 #5789 #5817 #5795 #5830 #5833 #5834 #5841 #5840 #5838 #5842 #5837 #5849 #5850
   #5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 #5871 #5864 #5874 #5884 #5893 #5891
-  #5890
+  #5890 #5898
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
diff --git a/pants-plugins/uses_services/mongo_rules_test.py b/pants-plugins/uses_services/mongo_rules_test.py
@@ -75,6 +75,7 @@ def test_mongo_not_running(rule_runner: RuleRunner, mock_platform: Platform) ->
     request = UsesMongoRequest(
         db_host="127.100.20.7",
         db_port=10,  # unassigned port, unlikely to be used
+        db_connection_timeout=10,  # ms # very short as it should fail anyway
     )
 
     with pytest.raises(ExecutionError) as exception_info:
diff --git a/pants-plugins/uses_services/register.py b/pants-plugins/uses_services/register.py
@@ -16,7 +16,7 @@
     PythonTestsGeneratorTarget,
 )
 
-from uses_services import mongo_rules, platform_rules
+from uses_services import mongo_rules, platform_rules, rabbitmq_rules, redis_rules
 from uses_services.target_types import UsesServicesField
 
 
@@ -26,4 +26,6 @@ def rules():
         PythonTestTarget.register_plugin_field(UsesServicesField),
         *platform_rules.rules(),
         *mongo_rules.rules(),
+        *rabbitmq_rules.rules(),
+        *redis_rules.rules(),
     ]

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ def test_mongo_not_running(rule_runner: RuleRunner, mock_platform: Platform) ->`
`75`	`75`	`request = UsesMongoRequest(`
`76`	`76`	`db_host="127.100.20.7",`
`77`	`77`	`db_port=10, # unassigned port, unlikely to be used`
	`78`	`+ db_connection_timeout=10, # ms # very short as it should fail anyway`
`78`	`79`	`)`
`79`	`80`
`80`	`81`	`with pytest.raises(ExecutionError) as exception_info:`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`PythonTestsGeneratorTarget,`
`17`	`17`	`)`
`18`	`18`
`19`		`-from uses_services import mongo_rules, platform_rules`
	`19`	`+from uses_services import mongo_rules, platform_rules, rabbitmq_rules, redis_rules`
`20`	`20`	`from uses_services.target_types import UsesServicesField`
`21`	`21`
`22`	`22`
`@@ -26,4 +26,6 @@ def rules():`
`26`	`26`	`PythonTestTarget.register_plugin_field(UsesServicesField),`
`27`	`27`	`*platform_rules.rules(),`
`28`	`28`	`*mongo_rules.rules(),`
	`29`	`+ *rabbitmq_rules.rules(),`
	`30`	`+ *redis_rules.rules(),`
`29`	`31`	`]`