Skip to content

Commit

Permalink
chore: updating mocks for tests to test mender-connect JWT request ha…
Browse files Browse the repository at this point in the history 
…ndling

The thing to fix is to make `mender-connect` request a new JWT token on its own, so its not dependent on `mender-update` to do so. Previously **FetchJWTToken()** wasn’t called which wouldn’t let it call the JWT token independently, which made it dependent on **mender-update**. The PR (another PR) proposed to fix this issue uses **FetchJWTToken()** to fetch the token, to then for **WaitForJwtTokenStateChange()** to retrieve it in it’s waiting. The old mocks for the tests seemed to be more tailored to test the functionality with **GetJWTToken()**. This PR proposes a change in the mocks to better test the new implementation (where the 'new implementation' is the one proposed in the other PR for ticket MEN-6877)

Changelog: None

Ticket: MEN-6877
Signed-off-by: Sebastian Opsahl <sebastian.opsahl@northern.tech>
  • Loading branch information
@SebOpsahl
SebOpsahl committed May 2, 2024
1 parent b200d19 commit b7a8fb9
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 35 deletions.
55 changes: 31 additions & 24 deletions tests/acceptance/mocks/mock_dbus_server.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,33 @@

class IoMenderAuthenticationIface:
"""
<node>
<interface name="io.mender.Authentication1">
<method name="GetJwtToken">
<arg type="s" name="token" direction="out"/>
<arg type="s" name="server_url" direction="out"/>
</method>
<method name="FetchJwtToken">
<arg type="b" name="success" direction="out"/>
</method>
<signal name="JwtTokenStateChange">
<arg type="s" name="token"/>
<arg type="s" name="server_url"/>
</signal>
<method name="MockSetJwtToken">
<arg type="s" name="token" direction="in"/>
<arg type="s" name="server_url" direction="in"/>
</method>
<method name="MockSetJwtTokenAndEmitSignal">
<arg type="s" name="token" direction="in"/>
<arg type="s" name="server_url" direction="in"/>
</method>
</interface>
</node>
"""
<node>
<interface name="io.mender.Authentication1">
<method name="GetJwtToken">
<arg type="s" name="token" direction="out"/>
<arg type="s" name="server_url" direction="out"/>
</method>
<method name="FetchJwtToken">
<arg type="b" name="success" direction="out"/>
</method>
<signal name="JwtTokenStateChange">
<arg type="s" name="token"/>
<arg type="s" name="server_url"/>
</signal>
<method name="MockSetJwtToken">
<arg type="s" name="token" direction="in"/>
<arg type="s" name="server_url" direction="in"/>
</method>
<method name="MockSetJwtTokenAndEmitSignal">
<arg type="s" name="token" direction="in"/>
<arg type="s" name="server_url" direction="in"/>
</method>
<method name="MockEmitSignal">
<arg type="b" name="success" direction="out"/>
</method>
</interface>
</node>
"""

def __init__(self):
self.token = ""
Expand All @@ -68,6 +71,10 @@ def MockSetJwtTokenAndEmitSignal(self, token, server_url):
self.JwtTokenStateChange(self.token, self.server_url)
return True

def MockEmitSignal(self):
self.JwtTokenStateChange(self.token, self.server_url)
return True


loop = GLib.MainLoop()
bus = SystemBus()
Expand Down
39 changes: 28 additions & 11 deletions tests/acceptance/test_mender-connect.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,15 @@ def dbus_set_token_and_url_and_emit_signal(connection, token, server_url):
)


def dbus_emit_signal(connection):
connection.run(
"dbus-send --print-reply --system "
"--dest=io.mender.AuthenticationManager "
"/io/mender/AuthenticationManager "
"io.mender.Authentication1.MockEmitSignal "
)


def wait_for_string_in_log(connection, since, timeout, search_string):
output = ""
while qemu_system_time(connection) < since + timeout:
Expand Down Expand Up @@ -193,14 +202,18 @@ def test_mender_connect_auth_changes(
"""Test that mender-connect can re-establish the connection on D-Bus signals"""

try:
dbus_set_token_and_url(connection, "token1", "http://localhost:5000")

# start the mender-connect service
startup_time = qemu_system_time(connection)
connection.run(
"systemctl --job-mode=ignore-dependencies start mender-connect"
)

dbus_set_token_and_url(connection, "token1", "http://localhost:5000")

# sleep for a while to ensure a connection happens
time.sleep(60)
dbus_emit_signal(connection)
signal_time = qemu_system_time(connection)

# wait for first connect
_ = wait_for_string_in_log(
connection,
Expand All @@ -222,10 +235,10 @@ def test_mender_connect_auth_changes(
)

# 2. Change url
dbus_set_token_and_url(connection, "token2", "http://localhost:6000")
time.sleep(30)
signal_time = qemu_system_time(connection)
dbus_set_token_and_url_and_emit_signal(
connection, "token2", "http://localhost:6000"
)
dbus_emit_signal(connection)
_ = wait_for_string_in_log(
connection,
signal_time,
Expand Down Expand Up @@ -277,14 +290,18 @@ def test_mender_connect_reconnect(
"""Test that mender-connect can re-establish the connection on remote errors"""

try:
dbus_set_token_and_url(connection, "badtoken", "http://localhost:12345")

# start the mender-connect service
startup_time = qemu_system_time(connection)
connection.run(
"systemctl --job-mode=ignore-dependencies start mender-connect"
)

dbus_set_token_and_url(connection, "badtoken", "http://localhost:12345")

# sleep for a while to ensure a connection happens
time.sleep(80)
dbus_emit_signal(connection)
signal_time = qemu_system_time(connection)

# wait for error
if version_is_minimum(bitbake_variables, "mender-connect", "2.3.0"):
error_message = "connection manager failed to connect"
Expand All @@ -305,11 +322,11 @@ def test_mender_connect_reconnect(
)

dbus_set_token_and_url(connection, "", "")
kill_time = qemu_system_time(connection)
# kill the server and wait for error
with_mock_servers[1].kill()
kill_time = qemu_system_time(connection)
_ = wait_for_string_in_log(
connection, kill_time, 300, "error reconnecting:",
connection, kill_time, 300, "waiting for reconnect",
)

# Signal the other server
Expand Down

0 comments on commit b7a8fb9

Please sign in to comment.