1 files changed, 4 insertions, 21 deletions
diff --git a/qpid/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py
index db5ec03df2..c303ca652a 100644
--- a/qpid/python/qpid/tests/messaging/endpoints.py
+++ b/qpid/python/qpid/tests/messaging/endpoints.py
@@ -46,10 +46,6 @@ class SetupTests(Base):
     self.conn.open()
     self.ping(self.conn.session())
 
-  def testTcpNodelay(self):
-    self.conn = Connection.establish(self.broker, tcp_nodelay=True)
-    assert self.conn._driver._transport.socket.getsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY)
-
   def testConnectError(self):
     try:
       # Specifying port 0 yields a bad address on Windows; port 4 is unassigned
@@ -115,8 +111,8 @@ class SetupTests(Base):
 
     class flaky:
 
-      def __init__(self, conn, host, port):
-        self.real = real(conn, host, port)
+      def __init__(self, host, port):
+        self.real = real(host, port)
         self.sent_count = 0
         self.recv_count = 0
 
@@ -190,9 +186,6 @@ class ConnectionTests(Base):
   def setup_connection(self):
     return Connection.establish(self.broker, **self.connection_options())
 
-  def testCheckClosed(self):
-    assert not self.conn.check_closed()
-
   def testSessionAnon(self):
     ssn1 = self.conn.session()
     ssn2 = self.conn.session()
@@ -255,8 +248,8 @@ class ConnectionTests(Base):
 
 class hangable:
 
-  def __init__(self, conn, host, port):
-    self.tcp = TRANSPORTS["tcp"](conn, host, port)
+  def __init__(self, host, port):
+    self.tcp = TRANSPORTS["tcp"](host, port)
     self.hung = False
 
   def hang(self):
@@ -1186,16 +1179,6 @@ test-link-bindings-queue; {
       snd.send(m)
     self.drain(qrcv, expected=msgs)
 
-  def testAssert1(self):
-    try:
-      snd = self.ssn.sender("amq.topic; {assert: always, node: {type: queue}}")
-      assert 0, "assertion failed to trigger"
-    except AssertionFailed, e:
-      pass
-
-  def testAssert2(self):
-    snd = self.ssn.sender("amq.topic; {assert: always}")
-
 NOSUCH_Q = "this-queue-should-not-exist"
 UNPARSEABLE_ADDR = "name/subject; {bad options"
 UNLEXABLE_ADDR = "\0x0\0x1\0x2\0x3"