Merge lp:~cjwatson/rabbitfixture/status-no-ellipsis into lp:rabbitfixture

[Colin Watson]

Adjust status_regex to cope with removed ellipsis in rabbitmq-server 3.6.10.

[Free Ekanayaka (free.ekanayaka)]

Looks good to me.

review: Approve

=== modified file 'rabbitfixture/server.py'
--- rabbitfixture/server.py	2018-03-11 00:48:17 +0000
+++ rabbitfixture/server.py	2019-03-04 17:01:15 +0000
@@ -80,8 +80,8 @@
 status_regex = re.compile(r"""
     Status\ of\ node\ '?
       (?P<nodename>        # begin capture group
-        [^@]+@[^@']+       # a node is name@hostname
-      )'?\ \.\.\.\n        # end capture group
+        [^@]+@[^@']+?      # a node is name@hostname
+      )'?(?:\ \.\.\.)?\n   # end capture group
     \[(\{pid,\d+\},\n\ )?  # old versions don't show the pid.
     \{running_applications,.*
         \{rabbit,"RabbitMQ"

=== modified file 'rabbitfixture/tests/test_server.py'
--- rabbitfixture/tests/test_server.py	2018-03-11 00:48:17 +0000
+++ rabbitfixture/tests/test_server.py	2019-03-04 17:01:15 +0000
@@ -203,3 +203,27 @@
         self.assertEqual(
             "tmpTAIyVi@obidos",
             get_nodename_from_status(example_status))
+
+    def test_get_nodename_from_status_no_ellipsis(self):
+        # The trailing ellipsis was removed in rabbitmq-server 3.6.10.
+        example_status = dedent("""\
+        Status of node tmpTAIyVi@obidos
+        [{running_applications,
+             [{rabbit_management,"RabbitMQ Management Console","0.0.0"},
+              {webmachine,"webmachine","1.8.1"},
+              {crypto,"CRYPTO version 1","1.6.3"},
+              {amqp_client,"RabbitMQ AMQP Client","2.3.1"},
+              {rabbit_management_agent,"RabbitMQ Management Agent","0.0.0"},
+              {rabbit,"RabbitMQ","2.3.1"},
+              {mnesia,"MNESIA  CXC 138 12","4.4.12"},
+              {os_mon,"CPO  CXC 138 46","2.2.4"},
+              {sasl,"SASL  CXC 138 11","2.1.8"},
+              {rabbit_mochiweb,"RabbitMQ Mochiweb Embedding","0.0.0"},
+              {stdlib,"ERTS  CXC 138 10","1.16.4"},
+              {kernel,"ERTS  CXC 138 10","2.13.4"}]},
+         {nodes,[{disc,[tmpTAIyVi@obidos]}]},
+         {running_nodes,[tmpTAIyVi@obidos]}]
+        """)
+        self.assertEqual(
+            "tmpTAIyVi@obidos",
+            get_nodename_from_status(example_status))