You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2021/07/23 12:44:44 UTC
[qpid-dispatch] branch main updated (4d86742 -> 1f2c252)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git.
from 4d86742 DISPATCH-1987: Modified test to compare sha256 digests of image files. This closes #1309
new ee48041 DISPATCH-2098 Skip the entire websockets test class if deps are missing
new 1f2c252 NO-JIRA Minor cleanup of test Process#__init__()
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tests/system_test.py | 5 +++--
tests/system_tests_websockets.py | 12 +++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-dispatch] 01/02: DISPATCH-2098 Skip the entire websockets
test class if deps are missing
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit ee48041310b5dfb4e42bd1b865ed4f435c89eb37
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Fri Jul 23 13:10:41 2021 +0200
DISPATCH-2098 Skip the entire websockets test class if deps are missing
This fixes failure to dispose with the router in the correct way upon individual test skip on macOS.
---
tests/system_tests_websockets.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/system_tests_websockets.py b/tests/system_tests_websockets.py
index 613f9fa..d9b5854 100644
--- a/tests/system_tests_websockets.py
+++ b/tests/system_tests_websockets.py
@@ -17,12 +17,19 @@
# under the License
#
+import asyncio
import unittest
+try:
+ import websockets
+except ImportError:
+ websockets = None
+
from system_test import Qdrouterd
from system_test import main_module, TestCase, Process
+@unittest.skipIf(websockets is None, "python test requirement package `websockets` is missing")
class WebsocketsConsoleTest(TestCase):
"""Run websockets tests connecting to the console"""
@@ -43,11 +50,6 @@ class WebsocketsConsoleTest(TestCase):
"""Verify the shutdown sequence works when a client is connected to a websocket port.
Previously, this was broken in DISPATCH-857, DISPATCH-945, DISPATCH-2098"""
- import asyncio
- try:
- import websockets
- except ImportError:
- self.skipTest("python test requirement package `websockets` is missing")
async def run():
uri = f"ws://localhost:{self.http_port}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-dispatch] 02/02: NO-JIRA Minor cleanup of test
Process#__init__()
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit 1f2c2522f418398a20c8b7ee2c86c489a2742cb5
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Fri Jul 23 13:11:27 2021 +0200
NO-JIRA Minor cleanup of test Process#__init__()
---
tests/system_test.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/system_test.py b/tests/system_test.py
index 1f7b4ea..01cb585 100755
--- a/tests/system_test.py
+++ b/tests/system_test.py
@@ -247,7 +247,7 @@ class Process(subprocess.Popen):
def __init__(self, args, name=None, expect=EXIT_OK, **kwargs):
"""
Takes same arguments as subprocess.Popen. Some additional/special args:
- @param expect: Raise error if process staus not as expected at end of test:
+ @param expect: Raise error if process status not as expected at end of test:
L{RUNNING} - expect still running.
L{EXIT_OK} - expect process to have terminated with 0 exit status.
L{EXIT_FAIL} - expect process to have terminated with exit status 1.
@@ -256,7 +256,8 @@ class Process(subprocess.Popen):
@keyword stderr: Defaults to be the same as stdout
"""
self.name = name or os.path.basename(args[0])
- self.args, self.expect = args, expect
+ self.args = args
+ self.expect = expect
self.outdir = os.getcwd()
self.outfile = os.path.abspath(self.unique(self.name))
self.torndown = False
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org