Author: aconway Date: 2011-01-21 12:49:28 -0500 (Fri, 21 Jan 2011) New Revision: 4439 Modified: store/trunk/cpp/tests/python_tests/client_persistence.py store/trunk/cpp/tests/python_tests/flow_to_disk.py store/trunk/cpp/tests/python_tests/resize.py store/trunk/cpp/tests/python_tests/store_test.py Log: Move brokertest.py from qpid/python to qpid/cpp. brokertest.py is a framework for tests using the C++ broker, so it belongs in the cpp tree rather than the python tree. It is installed to libexec/qpid/tests/ so it can be used from an installation of qpid cpp. Modified: store/trunk/cpp/tests/python_tests/client_persistence.py =================================================================== --- store/trunk/cpp/tests/python_tests/client_persistence.py 2011-01-14 19:52:45 UTC (rev 4438) +++ store/trunk/cpp/tests/python_tests/client_persistence.py 2011-01-21 17:49:28 UTC (rev 4439) @@ -21,7 +21,7 @@ The GNU Lesser General Public License is available in the file COPYING. """ -from qpid.brokertest import EXPECT_EXIT_OK +from brokertest import EXPECT_EXIT_OK from store_test import StoreTest, Qmf, store_args from qpid.messaging import * Modified: store/trunk/cpp/tests/python_tests/flow_to_disk.py =================================================================== --- store/trunk/cpp/tests/python_tests/flow_to_disk.py 2011-01-14 19:52:45 UTC (rev 4438) +++ store/trunk/cpp/tests/python_tests/flow_to_disk.py 2011-01-21 17:49:28 UTC (rev 4439) @@ -22,7 +22,7 @@ """ import qpid -from qpid.brokertest import EXPECT_EXIT_OK, EXPECT_UNKNOWN +from brokertest import EXPECT_EXIT_OK, EXPECT_UNKNOWN from qpid.datatypes import uuid4 from store_test import StoreTest, store_args from qpid.messaging import Message, TargetCapacityExceeded, ServerError #SessionError, SendError Modified: store/trunk/cpp/tests/python_tests/resize.py =================================================================== --- store/trunk/cpp/tests/python_tests/resize.py 2011-01-14 19:52:45 UTC (rev 4438) +++ store/trunk/cpp/tests/python_tests/resize.py 2011-01-21 17:49:28 UTC (rev 4439) @@ -25,7 +25,7 @@ import os import subprocess -from qpid.brokertest import EXPECT_EXIT_OK +from brokertest import EXPECT_EXIT_OK from qpid.datatypes import uuid4 from store_test import StoreTest, store_args from qpid.messaging import Message Modified: store/trunk/cpp/tests/python_tests/store_test.py =================================================================== --- store/trunk/cpp/tests/python_tests/store_test.py 2011-01-14 19:52:45 UTC (rev 4438) +++ store/trunk/cpp/tests/python_tests/store_test.py 2011-01-21 17:49:28 UTC (rev 4439) @@ -22,7 +22,7 @@ """ import re -from qpid.brokertest import BrokerTest +from brokertest import BrokerTest from qpid.messaging import Empty from qmf.console import Session