Techdebt: Replace sure with regular assertions in IOTData (#6619)

tests/test_iotdata/test_iotdata.py

@@ -1,6 +1,5 @@
 import json
 import boto3
-import sure  # noqa # pylint: disable=unused-import
 import pytest
 from botocore.exceptions import ClientError
 
@@ -25,22 +24,18 @@ def test_basic():
 
     payload = json.loads(res["payload"].read())
     expected_state = '{"desired": {"led": "on"}}'
-    payload.should.have.key("state").which.should.equal(json.loads(expected_state))
+    assert payload["state"] == json.loads(expected_state)
-    payload.should.have.key("metadata").which.should.have.key(
+    assert "led" in payload["metadata"]["desired"]
-        "desired"
+    assert payload["version"] == 1
-    ).which.should.have.key("led")
+    assert "timestamp" in payload
-    payload.should.have.key("version").which.should.equal(1)
-    payload.should.have.key("timestamp")
 
     res = client.get_thing_shadow(thingName=name)
     payload = json.loads(res["payload"].read())
     expected_state = b'{"desired": {"led": "on"}, "delta": {"led": "on"}}'
-    payload.should.have.key("state").which.should.equal(json.loads(expected_state))
+    assert payload["state"] == json.loads(expected_state)
-    payload.should.have.key("metadata").which.should.have.key(
+    assert "led" in payload["metadata"]["desired"]
-        "desired"
+    assert payload["version"] == 1
-    ).which.should.have.key("led")
+    assert "timestamp" in payload
-    payload.should.have.key("version").which.should.equal(1)
-    payload.should.have.key("timestamp")
 
     client.delete_thing_shadow(thingName=name)
     with pytest.raises(ClientError):
@@ -60,50 +55,42 @@ def test_update():
     res = client.update_thing_shadow(thingName=name, payload=raw_payload)
     payload = json.loads(res["payload"].read())
     expected_state = '{"desired": {"led": "on"}}'
-    payload.should.have.key("state").which.should.equal(json.loads(expected_state))
+    assert payload["state"] == json.loads(expected_state)
-    payload.should.have.key("metadata").which.should.have.key(
+    assert "led" in payload["metadata"]["desired"]
-        "desired"
+    assert payload["version"] == 1
-    ).which.should.have.key("led")
+    assert "timestamp" in payload
-    payload.should.have.key("version").which.should.equal(1)
-    payload.should.have.key("timestamp")
 
     res = client.get_thing_shadow(thingName=name)
     payload = json.loads(res["payload"].read())
     expected_state = b'{"desired": {"led": "on"}, "delta": {"led": "on"}}'
-    payload.should.have.key("state").which.should.equal(json.loads(expected_state))
+    assert payload["state"] == json.loads(expected_state)
-    payload.should.have.key("metadata").which.should.have.key(
+    assert "led" in payload["metadata"]["desired"]
-        "desired"
+    assert payload["version"] == 1
-    ).which.should.have.key("led")
+    assert "timestamp" in payload
-    payload.should.have.key("version").which.should.equal(1)
-    payload.should.have.key("timestamp")
 
     # reporting new state
     new_payload = b'{"state": {"reported": {"led": "on"}}}'
     res = client.update_thing_shadow(thingName=name, payload=new_payload)
     payload = json.loads(res["payload"].read())
     expected_state = '{"reported": {"led": "on"}}'
-    payload.should.have.key("state").which.should.equal(json.loads(expected_state))
+    assert payload["state"] == json.loads(expected_state)
-    payload.should.have.key("metadata").which.should.have.key(
+    assert "led" in payload["metadata"]["reported"]
-        "reported"
+    assert payload["version"] == 2
-    ).which.should.have.key("led")
+    assert "timestamp" in payload
-    payload.should.have.key("version").which.should.equal(2)
-    payload.should.have.key("timestamp")
 
     res = client.get_thing_shadow(thingName=name)
     payload = json.loads(res["payload"].read())
     expected_state = b'{"desired": {"led": "on"}, "reported": {"led": "on"}}'
-    payload.should.have.key("state").which.should.equal(json.loads(expected_state))
+    assert payload["state"] == json.loads(expected_state)
-    payload.should.have.key("metadata").which.should.have.key(
+    assert "led" in payload["metadata"]["desired"]
-        "desired"
+    assert payload["version"] == 2
-    ).which.should.have.key("led")
+    assert "timestamp" in payload
-    payload.should.have.key("version").which.should.equal(2)
-    payload.should.have.key("timestamp")
 
     raw_payload = b'{"state": {"desired": {"led": "on"}}, "version": 1}'
     with pytest.raises(ClientError) as ex:
         client.update_thing_shadow(thingName=name, payload=raw_payload)
-    ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(409)
+    assert ex.value.response["ResponseMetadata"]["HTTPStatusCode"] == 409
-    ex.value.response["Error"]["Message"].should.equal("Version conflict")
+    assert ex.value.response["Error"]["Message"] == "Version conflict"
 
 
 @mock_iotdata
@@ -116,10 +103,10 @@ def test_publish():
 
     if not settings.TEST_SERVER_MODE:
         mock_backend = moto.iotdata.models.iotdata_backends[ACCOUNT_ID][region_name]
-        mock_backend.published_payloads.should.have.length_of(3)
+        assert len(mock_backend.published_payloads) == 3
-        mock_backend.published_payloads.should.contain(("test/topic1", b"pl1"))
+        assert ("test/topic1", b"pl1") in mock_backend.published_payloads
-        mock_backend.published_payloads.should.contain(("test/topic2", b"pl2"))
+        assert ("test/topic2", b"pl2") in mock_backend.published_payloads
-        mock_backend.published_payloads.should.contain(("test/topic3", b"\xbf"))
+        assert ("test/topic3", b"\xbf") in mock_backend.published_payloads
 
 
 @mock_iot

tests/test_iotdata/test_server.py

@@ -1,7 +1,6 @@
 from urllib.parse import quote
 
 import pytest
-import sure  # noqa # pylint: disable=unused-import
 
 import moto.server as server
 from moto import mock_iotdata
@@ -19,7 +18,7 @@ def test_iotdata_list():
     # just making sure that server is up
     thing_name = "nothing"
     res = test_client.get(f"/things/{thing_name}/shadow")
-    res.status_code.should.equal(404)
+    assert res.status_code == 404
 
 
 @pytest.mark.parametrize(
@@ -38,4 +37,4 @@ def test_publish(url_encode_topic):
     topic_for_path = quote(topic, safe="") if url_encode_topic else topic
 
     result = test_client.post(f"/topics/{topic_for_path}")
-    result.status_code.should.equal(200)
+    assert result.status_code == 200