You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2018/08/28 15:35:01 UTC
qpid-dispatch git commit: DISPATCH-1108 - Fixed import errors in some
python system tests
Repository: qpid-dispatch
Updated Branches:
refs/heads/master d59ce4172 -> 6e03ab8a5
DISPATCH-1108 - Fixed import errors in some python system tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/6e03ab8a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/6e03ab8a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/6e03ab8a
Branch: refs/heads/master
Commit: 6e03ab8a5dc5059bb4645a0b608ded93a02ebc17
Parents: d59ce41
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Tue Aug 28 11:34:48 2018 -0400
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Tue Aug 28 11:34:48 2018 -0400
----------------------------------------------------------------------
tests/system_tests_delivery_abort.py | 6 ------
tests/system_tests_distribution.py | 8 --------
tests/system_tests_dynamic_terminus.py | 6 ------
tests/system_tests_edge_router.py | 7 -------
tests/system_tests_failover_list.py | 6 ------
tests/system_tests_global_delivery_counts.py | 2 +-
tests/system_tests_multi_tenancy.py | 6 ------
tests/system_tests_one_router.py | 2 +-
tests/system_tests_protocol_family.py | 6 ------
tests/system_tests_topology.py | 7 -------
tests/system_tests_topology_addition.py | 10 +---------
tests/system_tests_topology_disposition.py | 12 +-----------
tests/system_tests_two_routers.py | 9 +--------
13 files changed, 5 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_delivery_abort.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_delivery_abort.py b/tests/system_tests_delivery_abort.py
index 909b805..9b7418b 100644
--- a/tests/system_tests_delivery_abort.py
+++ b/tests/system_tests_delivery_abort.py
@@ -29,12 +29,6 @@ from proton.handlers import MessagingHandler
from proton.reactor import Container
from qpid_dispatch_internal.compat import BINARY
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
class RouterTest(TestCase):
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_distribution.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_distribution.py b/tests/system_tests_distribution.py
index 7ec33e1..0b48d26 100644
--- a/tests/system_tests_distribution.py
+++ b/tests/system_tests_distribution.py
@@ -28,14 +28,6 @@ from system_test import TestCase, Qdrouterd, main_module, TIMEOUT, SkipIfNee
from proton.handlers import MessagingHandler
from proton.reactor import Container, LinkOption, ApplicationEvent, EventInjector
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
-
-
#------------------------------------------------
# Helper classes for all tests.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_dynamic_terminus.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_dynamic_terminus.py b/tests/system_tests_dynamic_terminus.py
index 4ad5e19..eaf0ea3 100644
--- a/tests/system_tests_dynamic_terminus.py
+++ b/tests/system_tests_dynamic_terminus.py
@@ -28,13 +28,7 @@ from system_test import TestCase, Qdrouterd, main_module, TIMEOUT
from proton.handlers import MessagingHandler
from proton.reactor import Container, LinkOption
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
class RouterTest(TestCase):
inter_router_port = None
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_edge_router.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_edge_router.py b/tests/system_tests_edge_router.py
index 1c11a27..9819a53 100644
--- a/tests/system_tests_edge_router.py
+++ b/tests/system_tests_edge_router.py
@@ -23,13 +23,6 @@ from system_test import TestCase, Qdrouterd, main_module, TIMEOUT
from proton.handlers import MessagingHandler
from proton.reactor import Container, DynamicNodeProperties
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
-
class RouterTest(TestCase):
inter_router_port = None
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_failover_list.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_failover_list.py b/tests/system_tests_failover_list.py
index 123ceb3..279dbef 100644
--- a/tests/system_tests_failover_list.py
+++ b/tests/system_tests_failover_list.py
@@ -28,12 +28,6 @@ from system_test import TestCase, Qdrouterd, main_module, TIMEOUT
from proton.handlers import MessagingHandler
from proton.reactor import Container
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
class RouterTest(TestCase):
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_global_delivery_counts.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_global_delivery_counts.py b/tests/system_tests_global_delivery_counts.py
index 14c38df..932f401 100644
--- a/tests/system_tests_global_delivery_counts.py
+++ b/tests/system_tests_global_delivery_counts.py
@@ -19,7 +19,7 @@
from time import sleep
-from proton import Condition, Message, Delivery, PENDING, ACCEPTED, REJECTED, Url, symbol, Timeout
+from proton import Condition, Message, Delivery, Timeout
from system_test import TestCase, Qdrouterd, TIMEOUT
from proton.handlers import MessagingHandler
from proton.reactor import Container
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_multi_tenancy.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_multi_tenancy.py b/tests/system_tests_multi_tenancy.py
index 8ce34d9..b3da142 100644
--- a/tests/system_tests_multi_tenancy.py
+++ b/tests/system_tests_multi_tenancy.py
@@ -30,12 +30,6 @@ from proton.reactor import Container, DynamicNodeProperties
from qpid_dispatch_internal.compat import UNICODE
from qpid_dispatch.management.client import Node
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
class RouterTest(TestCase):
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_one_router.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py
index b40a95b..94ccd36 100644
--- a/tests/system_tests_one_router.py
+++ b/tests/system_tests_one_router.py
@@ -23,7 +23,7 @@ from __future__ import absolute_import
from __future__ import print_function
import unittest2 as unittest
-from proton import Condition, Message, Delivery, PENDING, ACCEPTED, REJECTED, Url, symbol, Timeout
+from proton import Condition, Message, Delivery, Url, symbol, Timeout
from system_test import TestCase, Qdrouterd, main_module, TIMEOUT
from proton.handlers import MessagingHandler, TransactionHandler
from proton.reactor import Container, AtMostOnce, AtLeastOnce, DynamicNodeProperties, LinkOption, ApplicationEvent, EventInjector
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_protocol_family.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_protocol_family.py b/tests/system_tests_protocol_family.py
index 16aea3d..5c7f58c 100644
--- a/tests/system_tests_protocol_family.py
+++ b/tests/system_tests_protocol_family.py
@@ -29,12 +29,6 @@ from proton.reactor import Container
from system_test import TestCase, Qdrouterd, main_module
from qpid_dispatch_internal.policy.policy_util import is_ipv6_enabled
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
-
class ProtocolFamilyTest(TestCase):
@classmethod
def setUpClass(cls):
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_topology.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_topology.py b/tests/system_tests_topology.py
index afe5633..f4fffbb 100644
--- a/tests/system_tests_topology.py
+++ b/tests/system_tests_topology.py
@@ -30,13 +30,6 @@ from proton.reactor import Container
import time
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
-
#------------------------------------------------
# Helper classes for all tests.
#------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_topology_addition.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_topology_addition.py b/tests/system_tests_topology_addition.py
index 2e06b55..23ad087 100644
--- a/tests/system_tests_topology_addition.py
+++ b/tests/system_tests_topology_addition.py
@@ -24,7 +24,7 @@ from __future__ import print_function
import unittest, os, json
from subprocess import PIPE, STDOUT
-from proton import Message, PENDING, ACCEPTED, REJECTED, RELEASED, SSLDomain, SSLUnavailable, Timeout
+from proton import Message, Timeout
from system_test import TestCase, Qdrouterd, main_module, DIR, TIMEOUT, Process
from proton.handlers import MessagingHandler
from proton.reactor import Container, AtMostOnce, AtLeastOnce, DynamicNodeProperties, LinkOption, ApplicationEvent, EventInjector
@@ -34,14 +34,6 @@ from qpid_dispatch.management.client import Node
import time
import datetime
-
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
-
#====================================================
# Helper classes for all tests.
#====================================================
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_topology_disposition.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_topology_disposition.py b/tests/system_tests_topology_disposition.py
index e1e1328..1b0d922 100644
--- a/tests/system_tests_topology_disposition.py
+++ b/tests/system_tests_topology_disposition.py
@@ -24,7 +24,7 @@ from __future__ import print_function
import unittest, os, json
from subprocess import PIPE, STDOUT
-from proton import Message, PENDING, ACCEPTED, REJECTED, RELEASED, SSLDomain, SSLUnavailable, Timeout
+from proton import Message, SSLDomain, SSLUnavailable, Timeout
from system_test import TestCase, Qdrouterd, main_module, DIR, TIMEOUT, Process
from proton.handlers import MessagingHandler
from proton.reactor import Container, AtMostOnce, AtLeastOnce, DynamicNodeProperties, LinkOption, ApplicationEvent, EventInjector
@@ -38,16 +38,6 @@ import pdb
import inspect
-
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
-
-
-
#================================================
# Helper classes for all tests.
#================================================
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6e03ab8a/tests/system_tests_two_routers.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py
index a624dc2..615f059 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -28,7 +28,7 @@ import unittest2 as unittest
import logging
from threading import Timer
from subprocess import PIPE, STDOUT
-from proton import Message, PENDING, ACCEPTED, REJECTED, Timeout, Delivery
+from proton import Message, Timeout, Delivery
from system_test import TestCase, Process, Qdrouterd, main_module, TIMEOUT
from system_test import AsyncTestReceiver
@@ -38,13 +38,6 @@ from proton.utils import BlockingConnection
from qpid_dispatch.management.client import Node
-# PROTON-828:
-try:
- from proton import MODIFIED
-except ImportError:
- from proton import PN_STATUS_MODIFIED as MODIFIED
-
-
class TwoRouterTest(TestCase):
inter_router_port = None
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org