Fix PubSubInterceptor for None headers and enhance testing

pyproject.toml

@@ -26,6 +26,7 @@ anypubsub = "^0.6"
 # todo remove dependency on grequests
 grequests = "^0.6.0"
 volttron-core = ">=2.0.0rc16"
+volttron-lib-auth = ">=2.0.0rc6"
 python-dateutil = "^2.8.2"
 docker = "^6.0.1"
 pytest-timeout = "^2.3.1"

pytest.ini

@@ -1,3 +1,5 @@
 [pytest]
 markers =
     control: Test for volttron-ctl or vctl commands
+    config_store: Test for configuration store functionality
+    pubsub: Test for publish/subscribe functionality

src/volttrontesting/__init__.py

@@ -23,11 +23,7 @@
 # }}}
 
 from volttrontesting.client_mock import TestClient
-from volttrontesting.server_mock import TestServer
 from volttrontesting.platformwrapper import PlatformWrapper
+from volttrontesting.server_mock import TestServer
 
-__all__ = [
-    "TestClient",
-    "TestServer",
-    "PlatformWrapper"
-]
+__all__ = ["TestClient", "TestServer", "PlatformWrapper"]

src/volttrontesting/fixtures/rmq_test_setup.py

@@ -22,16 +22,35 @@
 # ===----------------------------------------------------------------------===
 # }}}
 
+# NOTE: This module is currently not in use and requires RabbitMQ-specific 
+# volttron modules that are not available in volttron-core.
+# It is kept for potential future RabbitMQ support.
+
 import logging
 import os
 import shutil
 
 import yaml
 
-from volttron.platform import instance_setup, get_home
-from volttron.utils import store_message_bus_config
-from volttron.utils.rmq_setup import setup_rabbitmq_volttron
-from volttrontesting.utils.utils import get_hostname_and_random_port
+# These imports will fail without RabbitMQ-specific volttron packages
+try:
+    from volttron.platform import instance_setup, get_home
+    from volttron.utils import store_message_bus_config
+    from volttron.utils.rmq_setup import setup_rabbitmq_volttron
+    RMQ_AVAILABLE = True
+except ImportError:
+    RMQ_AVAILABLE = False
+    # Provide stubs to prevent import errors
+    def instance_setup(*args, **kwargs):
+        raise NotImplementedError("RabbitMQ support not available")
+    def get_home():
+        raise NotImplementedError("RabbitMQ support not available")
+    def store_message_bus_config(*args, **kwargs):
+        raise NotImplementedError("RabbitMQ support not available")
+    def setup_rabbitmq_volttron(*args, **kwargs):
+        raise NotImplementedError("RabbitMQ support not available")
+
+from volttrontesting.utils import get_hostname_and_random_port
 
 HOME = os.environ.get('HOME')
 _log = logging.getLogger(__name__)