Merge pull request #13799 from rabbitmq/mergify/bp/v4.1.x/pr-13752

Selenium suites: use RABBITMQ_ENABLED_PLUGINS over RABBITMQ_ENABLED_PLUGINS_FILE (backport #13752)

Author: michaelklishin

selenium/bin/components/rabbitmq

@@ -69,20 +69,22 @@ start_local_rabbitmq() {
   RABBITMQ_TEST_DIR="${RABBITMQ_CONFIG_DIR}" ${BIN_DIR}/gen-rabbitmq-conf ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_RABBITMQ_CONF
 
   print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF"
-  ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG
   cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/
+  RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}'`
+  print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS"
+
+  ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG
   RESULT=$?
-  cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/
   if [ $RESULT -eq 0 ]; then
-    print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_ADVANCED_CONFIG"
-  	gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
-  		RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \
+    print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_ADVANCED_CONFIG"    
+    gmake --directory=${RABBITMQ_SERVER_ROOT}  \
+        RABBITMQ_ENABLED_PLUGINS="$RABBITMQ_ENABLED_PLUGINS" \
   		RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF \
-      RABBITMQ_ADVANCED_CONFIG_FILE=/tmp$MOUNT_ADVANCED_CONFIG
+        RABBITMQ_ADVANCED_CONFIG_FILE=/tmp$MOUNT_ADVANCED_CONFIG run-broker
   else
-    gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
-  		RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \
-  		RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF
+    gmake --directory=${RABBITMQ_SERVER_ROOT} \
+        RABBITMQ_ENABLED_PLUGINS="$RABBITMQ_ENABLED_PLUGINS" \
+  		RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF run-broker
   fi
   print "> RABBITMQ_TEST_DIR: ${RABBITMQ_CONFIG_DIR}"
 

selenium/test/basic-auth/enabled_plugins

@@ -1,15 +1,2 @@
-[accept,amqp10_client,amqp_client,base64url,cowboy,cowlib,eetcd,gun,jose,
- oauth2_client,prometheus,rabbitmq_amqp1_0,rabbitmq_auth_backend_cache,
- rabbitmq_auth_backend_http,rabbitmq_auth_backend_ldap,
- rabbitmq_auth_backend_oauth2,rabbitmq_auth_mechanism_ssl,rabbitmq_aws,
- rabbitmq_consistent_hash_exchange,rabbitmq_event_exchange,
- rabbitmq_federation,rabbitmq_federation_management,
- rabbitmq_jms_topic_exchange,rabbitmq_management,rabbitmq_management_agent,
- rabbitmq_mqtt,rabbitmq_peer_discovery_aws,rabbitmq_peer_discovery_common,
- rabbitmq_peer_discovery_consul,rabbitmq_peer_discovery_etcd,
- rabbitmq_peer_discovery_k8s,rabbitmq_prometheus,rabbitmq_random_exchange,
- rabbitmq_recent_history_exchange,rabbitmq_sharding,rabbitmq_shovel,
- rabbitmq_shovel_management,rabbitmq_stomp,rabbitmq_stream,
- rabbitmq_stream_common,rabbitmq_stream_management,rabbitmq_top,
- rabbitmq_tracing,rabbitmq_trust_store,rabbitmq_web_dispatch,
- rabbitmq_web_mqtt,rabbitmq_web_stomp].
+[rabbitmq_management,rabbitmq_stream,rabbitmq_stream_common,rabbitmq_stream_management,
+rabbitmq_top,rabbitmq_tracing,rabbitmq_federation_management,rabbitmq_shovel_management].

selenium/test/exchanges/management.js

@@ -32,7 +32,7 @@ describe('Exchange management', function () {
   })
 
   it('display summary of exchanges', async function () {
-    assert.equal("All exchanges (15)", await exchanges.getPagingSectionHeaderText())
+    assert.equal("All exchanges (14)", await exchanges.getPagingSectionHeaderText())
   })
 
   it('list all default exchanges', async function () {
@@ -44,7 +44,6 @@ describe('Exchange management', function () {
       ["/", "amq.fanout", "fanout"],
       ["/", "amq.headers", "headers"],
       ["/", "amq.match", "headers"],
-      ["/", "amq.rabbitmq.event", "topic"],
       ["/", "amq.rabbitmq.trace", "topic"],
       ["/", "amq.topic", "topic"],