Skip to content

increment sequence of commands as spec (fixes #214) #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eigenein merged 3 commits into from
Mar 9, 2023
Merged

increment sequence of commands as spec (fixes #214) #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1119ddf
increment sequence of commands as spec
emnoor Mar 5, 2023
0812347
fix tests
emnoor Mar 5, 2023
9c0c1f4
remove redundant arguments
emnoor Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions smpplib/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ class BindTransmitter(Command):
)

def __init__(self, command, **kwargs):
super(BindTransmitter, self).__init__(command, need_sequence=False, **kwargs)
super(BindTransmitter, self).__init__(command, **kwargs)

self._set_vars(**(dict.fromkeys(self.params)))
self.interface_version = consts.SMPP_VERSION_34
Expand Down Expand Up @@ -817,7 +817,7 @@ class DeliverSM(SubmitSM):
)

def __init__(self, command, **kwargs):
super(DeliverSM, self).__init__(command, need_sequence=False, **kwargs)
super(DeliverSM, self).__init__(command, **kwargs)
self._set_vars(**(dict.fromkeys(self.params)))


Expand Down Expand Up @@ -900,7 +900,7 @@ class Unbind(Command):
params_order = ()

def __init__(self, command, **kwargs):
super(Unbind, self).__init__(command, need_sequence=False, **kwargs)
super(Unbind, self).__init__(command, **kwargs)


class UnbindResp(Command):
Expand All @@ -919,7 +919,7 @@ class EnquireLink(Command):
params_order = ()

def __init__(self, command, **kwargs):
super(EnquireLink, self).__init__(command, need_sequence=False, **kwargs)
super(EnquireLink, self).__init__(command, **kwargs)


class EnquireLinkResp(Command):
Expand Down
9 changes: 6 additions & 3 deletions smpplib/tests/test_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from smpplib import consts, exceptions
from smpplib.client import Client
from smpplib.command import DeliverSM

import pytest


def test_parse_deliver_sm():
pdu = DeliverSM('deliver_sm')
client = Client("localhost", 5679)
pdu = DeliverSM('deliver_sm', client=client)
pdu.parse(
b"\x00\x00\x00\xcb\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x01\x00"
b"\x01\x0131600000000\x00\x05\x00XXX YYYY\x00\x04\x00\x00\x00\x00\x00"
Expand All @@ -26,7 +28,8 @@ def test_parse_deliver_sm():


def test_unrecognised_optional_parameters():
pdu = DeliverSM("deliver_sm", allow_unknown_opt_params=True)
client = Client("localhost", 5679)
pdu = DeliverSM("deliver_sm", client=client, allow_unknown_opt_params=True)
pdu.parse(b'\x00\x00\x00\xa8\x00\x00\x00\x05\x00\x00\x00\x00/p\xc6'
b'\x9a\x00\x00\x0022549909028\x00\x01\x00\x00\x04\x00\x00'
b'\x00\x00\x00\x00\x00\x00iid:795920026 sub:001 dlvrd:001 '
Expand All @@ -37,7 +40,7 @@ def test_unrecognised_optional_parameters():
# This is only to avoid a breaking change, at some point the other behaviour
# should become the default.
with pytest.raises(exceptions.UnknownCommandError):
pdu2 = DeliverSM("deliver_sm")
pdu2 = DeliverSM("deliver_sm", client=client)
pdu2.parse(b'\x00\x00\x00\xa8\x00\x00\x00\x05\x00\x00\x00\x00/p\xc6'
b'\x9a\x00\x00\x0022549909028\x00\x01\x00\x00\x04\x00\x00'
b'\x00\x00\x00\x00\x00\x00iid:795920026 sub:001 dlvrd:001 '
Expand Down