From 7324276feed438b49deca395797ac8395d2abbba Mon Sep 17 00:00:00 2001 From: Kenneth Anthony Giusti Date: Fri, 15 Mar 2013 13:36:09 +0000 Subject: QPID-4649: use qpid uuid library instead of python git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1456950 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ha_store_tests.py | 3 +-- cpp/src/tests/ha_test.py | 3 +-- cpp/src/tests/ha_tests.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'cpp') diff --git a/cpp/src/tests/ha_store_tests.py b/cpp/src/tests/ha_store_tests.py index 21d403a46e..c6a514977c 100755 --- a/cpp/src/tests/ha_store_tests.py +++ b/cpp/src/tests/ha_store_tests.py @@ -26,13 +26,12 @@ It will only be run if the STORE_LIB environment variable is defined. import os, signal, sys, time, imp, re, subprocess, glob, random, logging, shutil, math, unittest, random import traceback from qpid.messaging import Message, NotFound, ConnectionError, ReceiverError, Connection, Timeout, Disposition, REJECTED, Empty -from qpid.datatypes import uuid4 +from qpid.datatypes import uuid4, UUID from brokertest import * from ha_test import * from threading import Thread, Lock, Condition from logging import getLogger, WARN, ERROR, DEBUG, INFO from qpidtoollibs import BrokerAgent -from uuid import UUID class StoreTests(BrokerTest): diff --git a/cpp/src/tests/ha_test.py b/cpp/src/tests/ha_test.py index cdf9d3dd17..f2ebb16ccc 100755 --- a/cpp/src/tests/ha_test.py +++ b/cpp/src/tests/ha_test.py @@ -21,12 +21,11 @@ import os, signal, sys, time, imp, re, subprocess, glob, random, logging, shutil, math, unittest, random import traceback from qpid.messaging import Message, NotFound, ConnectionError, ReceiverError, Connection, Timeout, Disposition, REJECTED, Empty -from qpid.datatypes import uuid4 +from qpid.datatypes import uuid4, UUID from brokertest import * from threading import Thread, Lock, Condition from logging import getLogger, WARN, ERROR, DEBUG, INFO from qpidtoollibs import BrokerAgent -from uuid import UUID log = getLogger(__name__) diff --git a/cpp/src/tests/ha_tests.py b/cpp/src/tests/ha_tests.py index 549dc0972e..e7be2a246d 100755 --- a/cpp/src/tests/ha_tests.py +++ b/cpp/src/tests/ha_tests.py @@ -21,13 +21,12 @@ import os, signal, sys, time, imp, re, subprocess, glob, random, logging, shutil, math, unittest, random import traceback from qpid.messaging import Message, SessionError, NotFound, ConnectionError, ReceiverError, Connection, Timeout, Disposition, REJECTED, Empty -from qpid.datatypes import uuid4 +from qpid.datatypes import uuid4, UUID from brokertest import * from ha_test import * from threading import Thread, Lock, Condition from logging import getLogger, WARN, ERROR, DEBUG, INFO from qpidtoollibs import BrokerAgent, EventHelper -from uuid import UUID log = getLogger(__name__) -- cgit v1.2.1