Merge pull request #8463 from rabbitmq/ik-bump-stomppy-2566

Bump stomp.py to v8.1.0.

Author: michaelklishin

deps/rabbitmq_stomp/test/python_SUITE.erl

@@ -40,11 +40,6 @@ init_per_group(_, Config) ->
     Config2 = rabbit_ct_helpers:run_setup_steps(
         Config1,
         rabbit_ct_broker_helpers:setup_steps()),
-    DataDir = ?config(data_dir, Config2),
-    PikaDir = filename:join([DataDir, "deps", "pika"]),
-    StomppyDir = filename:join([DataDir, "deps", "stomppy"]),
-    rabbit_ct_helpers:make(Config2, PikaDir, []),
-    rabbit_ct_helpers:make(Config2, StomppyDir, []),
     Config2.
 
 end_per_group(_, Config) ->
@@ -75,13 +70,6 @@ run(Config, Test) ->
     StompPortTls = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_stomp_tls),
     AmqpPort = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp),
     NodeName = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
-    PikaPath = filename:join([DataDir, "deps", "pika","pika"]),
-    StomppyPath = filename:join([DataDir, "deps", "stomppy", "stomppy"]),
-    PythonPath = case os:getenv("PYTHONPATH") of
-        false -> PikaPath ++ ":" ++ StomppyPath;
-        P -> PikaPath ++ ":" ++ StomppyPath ++ ":" ++ P
-    end,
-    os:putenv("PYTHONPATH", PythonPath),
     os:putenv("AMQP_PORT", integer_to_list(AmqpPort)),
     os:putenv("STOMP_PORT", integer_to_list(StompPort)),
     os:putenv("STOMP_PORT_TLS", integer_to_list(StompPortTls)),

deps/rabbitmq_stomp/test/python_SUITE_data/deps/pika/Makefile

@@ -1,5 +1,14 @@
 #!/usr/bin/env python3
 
+import sys
+import subprocess
+
+# implement pip as a subprocess:
+subprocess.check_call([sys.executable, '-m', 'pip', 'install',
+                       'stomp.py==8.1.0'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install',
+                       'pika==1.1.0'])
+
 import test_runner
 
 if __name__ == '__main__':

deps/rabbitmq_stomp/test/python_SUITE_data/deps/stomppy/Makefile

@@ -7,6 +7,15 @@
 ## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 ##
 
+import sys
+import subprocess
+
+# implement pip as a subprocess:
+subprocess.check_call([sys.executable, '-m', 'pip', 'install',
+                       'stomp.py==8.1.0'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install',
+                       'pika==1.1.0'])
+
 import unittest
 import sys
 import os

deps/rabbitmq_stomp/test/python_SUITE_data/src/main_runner.py

@@ -23,19 +23,17 @@
 class TestTLSConnection(unittest.TestCase):
 
     def __ssl_connect(self):
-        conn = stomp.Connection(host_and_ports = [ ('localhost', int(os.environ["STOMP_PORT_TLS"])) ],
-                                use_ssl = True, ssl_key_file = ssl_key_file,
-                                ssl_cert_file = ssl_cert_file,
-                                ssl_ca_certs = ssl_ca_certs)
+        conn = stomp.Connection(host_and_ports = [ ('localhost', int(os.environ["STOMP_PORT_TLS"])) ])
+        conn.set_ssl([ ('localhost', int(os.environ["STOMP_PORT_TLS"])) ], key_file = ssl_key_file,
+                     cert_file = ssl_cert_file, ca_certs = ssl_ca_certs)
         print("FILE: ".format(ssl_cert_file))
         conn.connect("guest", "guest")
         return conn
 
     def __ssl_auth_connect(self):
-        conn = stomp.Connection(host_and_ports = [ ('localhost', int(os.environ["STOMP_PORT_TLS"])) ],
-                                use_ssl = True, ssl_key_file = ssl_key_file,
-                                ssl_cert_file = ssl_cert_file,
-                                ssl_ca_certs = ssl_ca_certs)
+        conn = stomp.Connection(host_and_ports = [ ('localhost', int(os.environ["STOMP_PORT_TLS"])) ])
+        conn.set_ssl([ ('localhost', int(os.environ["STOMP_PORT_TLS"])) ], key_file = ssl_key_file,
+                     cert_file = ssl_cert_file, ca_certs = ssl_ca_certs)
         conn.connect()
         return conn
 
@@ -83,4 +81,4 @@ def __test_conn(self, conn):
     modules = [
         __name__
     ]
-    test_runner.run_unittests(modules)
+    test_runner.run_unittests(modules)

deps/rabbitmq_stomp/test/python_SUITE_data/src/test_runner.py

@@ -7,6 +7,15 @@
 ## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 ##
 
+import sys
+import subprocess
+
+# implement pip as a subprocess:
+subprocess.check_call([sys.executable, '-m', 'pip', 'install',
+                       'stomp.py==8.1.0'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install',
+                       'pika==1.1.0'])
+
 import test_runner
 import test_util