Merge pull request #36 from annatisch/debug

Bug fixes

Author: annatisch

HISTORY.rst

@@ -3,6 +3,14 @@
 Release History
 ===============
 
+1.0.1 (2018-08-29)
+++++++++++++++++++
+
+- Added some more checks in place to prevent lock hanging on a keybaord interrupt.
+- Fixed bug in setting MessageProperties.subject as string or bytes.
+- `uamqp.send_message` now returns a list of `uamqp.constants.MessageState` to indicate the success of each message sent.
+
+
 1.0.0 (2018-08-20)
 ++++++++++++++++++
 

build_many_linux_32bit.sh

@@ -4,7 +4,7 @@ set -e
 # To execute this script:
 # docker run --rm -v $PWD:/data local/manylinux_crypto32 /data/build_many_linux_32bit.sh
 
-export UAMQP_VERSION="1.0.0"
+export UAMQP_VERSION="1.0.1"
 
 export CPATH="/opt/pyca/cryptography/openssl/include"
 export LIBRARY_PATH="/opt/pyca/cryptography/openssl/lib"

build_many_linux_64bit.sh

@@ -4,7 +4,7 @@ set -e
 # To execute this script:
 # docker run --rm -v $PWD:/data local/manylinux_crypto64 /data/build_many_linux_64bit.sh
 
-export UAMQP_VERSION="1.0.0"
+export UAMQP_VERSION="1.0.1"
 
 export CPATH="/opt/pyca/cryptography/openssl/include"
 export LIBRARY_PATH="/opt/pyca/cryptography/openssl/lib"

dev_requirements.txt

@@ -3,4 +3,4 @@ pytest>=3.4.1
 pytest-asyncio>=0.6.0
 docutils>=0.14
 pygments>=2.2.0
-pylint==1.8.4
+pylint==2.1.1

samples/conftest.py

@@ -29,7 +29,9 @@ def live_iothub_config():
     try:
         config = {}
         config['hostname'] = os.environ['IOTHUB_HOSTNAME']
+        config['hub_name'] = os.environ['IOTHUB_HUB_NAME']
         config['device'] = os.environ['IOTHUB_DEVICE']
+        config['endpoint'] = os.environ['IOTHUB_ENDPOINT']
         config['key_name'] = os.environ['IOTHUB_SAS_POLICY']
         config['access_key'] = os.environ['IOTHUB_SAS_KEY']
         config['consumer_group'] = "$Default"
@@ -39,3 +41,15 @@ def live_iothub_config():
     else:
         return config
 
+
+@pytest.fixture()
+def rabbit_mq_config():
+    try:
+        config = {}
+        config['hostname'] = os.environ['RABBITMQ_HOSTNAME']
+        config['path'] = os.environ['RABBITMQ_PATH']
+    except KeyError:
+        pytest.skip("Live RabbitMQ configuration not found.")
+    else:
+        return config
+

samples/test_azure_event_hubs_send.py

@@ -31,7 +31,8 @@ def test_event_hubs_simple_send(live_eventhub_config):
     sas_auth = authentication.SASTokenAuth.from_shared_access_key(
         uri, live_eventhub_config['key_name'], live_eventhub_config['access_key'])
     target = "amqps://{}/{}".format(live_eventhub_config['hostname'], live_eventhub_config['event_hub'])
-    uamqp.send_message(target, msg_content, auth=sas_auth, debug=True)
+    result = uamqp.send_message(target, msg_content, auth=sas_auth, debug=True)
+    assert result == [uamqp.constants.MessageState.SendComplete]
 
 
 def test_event_hubs_client_send_sync(live_eventhub_config):
@@ -45,7 +46,7 @@ def test_event_hubs_client_send_sync(live_eventhub_config):
     for _ in range(10):
         header = uamqp.message.MessageHeader()
         header.durable = True
-        props = uamqp.message.MessageProperties(message_id=b"message id")
+        props = uamqp.message.MessageProperties(message_id=b"message id", subject="test_subject")
         msg_content = b"hello world"
         message = uamqp.Message(
             msg_content,
@@ -116,7 +117,7 @@ def data_generator():
         uri, live_eventhub_config['key_name'], live_eventhub_config['access_key'])
 
     target = "amqps://{}/{}/Partitions/0".format(live_eventhub_config['hostname'], live_eventhub_config['event_hub'])
-    send_client = uamqp.SendClient(target, auth=sas_auth, debug=False)
+    send_client = uamqp.SendClient(target, auth=sas_auth, debug=True)
     for _ in range(10):
         message_batch = uamqp.message.BatchMessage(data_generator())
         send_client.queue_message(message_batch)
@@ -134,4 +135,4 @@ def data_generator():
     config['consumer_group'] = "$Default"
     config['partition'] = "0"
 
-    test_event_hubs_client_send_sync(config)
+    test_event_hubs_batch_send_sync(config)