[rhmessaging-commits] rhmessaging commits: r4508 - in store/trunk/cpp: tests and 2 other directories.

Author: kpvdr Date: 2012-05-08 11:39:54 -0400 (Tue, 08 May 2012) New Revision: 4508 Modified: store/trunk/cpp/configure.ac store/trunk/cpp/tests/federation/Makefile.am store/trunk/cpp/tests/federation/run_federation_sys_tests store/trunk/cpp/tests/persistence.py store/trunk/cpp/tests/python_tests/client_persistence.py store/trunk/cpp/tests/python_tests/store_test.py Log: More store test fixes Modified: store/trunk/cpp/configure.ac =================================================================== --- store/trunk/cpp/configure.ac 2012-05-07 12:59:09 UTC (rev 4507) +++ store/trunk/cpp/configure.ac 2012-05-08 15:39:54 UTC (rev 4508) @@ -138,8 +138,10 @@ # Check for cluster module to see whether to enable cluster tests AC_MSG_CHECKING([presence of qpid cluster module]) found_cluster_so=no -if test x$with_qpid_checkout != x -a -f $QPID_SRC/.libs/cluster.so ; then +if test x$with_qpid_build != x -a -f $QPID_BLD/src/.libs/cluster.so ; then found_cluster_so=yes +elif test x$with_qpid_checkout != x -a -f $QPID_SRC/.libs/cluster.so ; then + found_cluster_so=yes elif test -f $QPID_LIB/qpid/daemon/cluster.so ; then found_cluster_so=yes fi Modified: store/trunk/cpp/tests/federation/Makefile.am =================================================================== --- store/trunk/cpp/tests/federation/Makefile.am 2012-05-07 12:59:09 UTC (rev 4507) +++ store/trunk/cpp/tests/federation/Makefile.am 2012-05-08 15:39:54 UTC (rev 4508) @@ -20,7 +20,6 @@ # The GNU Lesser General Public License is available in the file COPYING. -abs_builddir=@abs_builddir@ abs_srcdir=@abs_srcdir@ TMP_DATA_DIR=$(abs_srcdir)/../tmp_data_dir @@ -40,8 +39,7 @@ QPID_DIR=$(QPID_DIR) \ QPID_BLD=$(QPID_BLD) \ TMP_DATA_DIR=$(TMP_DATA_DIR) \ - abs_srcdir=$(abs_srcdir) \ - abs_builddir=$(abs_builddir) + abs_srcdir=$(abs_srcdir) check-long: all $(MAKE) check TESTS="$(LONG_TESTS)" SUBDIRS=. Modified: store/trunk/cpp/tests/federation/run_federation_sys_tests =================================================================== --- store/trunk/cpp/tests/federation/run_federation_sys_tests 2012-05-07 12:59:09 UTC (rev 4507) +++ store/trunk/cpp/tests/federation/run_federation_sys_tests 2012-05-08 15:39:54 UTC (rev 4508) @@ -23,9 +23,8 @@ # Run the federation tests. +source ${abs_srcdir}/federation_tests_env.sh -source ./federation_tests_env.sh - MODULENAME=federation_sys # Test for long test Modified: store/trunk/cpp/tests/persistence.py =================================================================== --- store/trunk/cpp/tests/persistence.py 2012-05-07 12:59:09 UTC (rev 4507) +++ store/trunk/cpp/tests/persistence.py 2012-05-08 15:39:54 UTC (rev 4508) @@ -64,13 +64,13 @@ session.message_transfer(destination="amq.direct", message=self.createMessage(routing_key="b", correlation_id="Msg0002", body="B_Message1")) - session.queue_declare(queue="lvq-test", durable=True, arguments={"qpid.last_value_queue":True}) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B1")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A1")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A2")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B2")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B3")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C1")) +# session.queue_declare(queue="lvq-test", durable=True, arguments={"qpid.last_value_queue":True}) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B1")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A1")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A2")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B2")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B3")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C1")) @@ -108,51 +108,51 @@ session.message_transfer(destination="amq.topic", message=self.createMessage(routing_key="abc", correlation_id="Msg0003", body="AB_Message2")) - #check LVQ exists and has exepected messages: - session.queue_declare(queue="lvq-test", durable=True, passive=True) - session.message_subscribe(destination="lvq", queue="lvq-test") - lvq = session.incoming("lvq") - lvq.start() - accepted = RangedSet() - for m in ["A2", "B3", "C1"]: - msg = lvq.get(timeout=1) - self.assertEquals(m, msg.body) - accepted.add(msg.id) - try: - extra = lvq.get(timeout=1) - self.fail("lvq-test not empty, contains: " + extra.body) - except Empty: None - #publish some more messages while subscriber is active (no replacement): - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C2")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C3")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A3")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A4")) - session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C4")) - #check that accepting replaced messages is safe - session.message_accept(accepted) +# #check LVQ exists and has exepected messages: +# session.queue_declare(queue="lvq-test", durable=True, passive=True) +# session.message_subscribe(destination="lvq", queue="lvq-test") +# lvq = session.incoming("lvq") +# lvq.start() +# accepted = RangedSet() +# for m in ["A2", "B3", "C1"]: +# msg = lvq.get(timeout=1) +# self.assertEquals(m, msg.body) +# accepted.add(msg.id) +# try: +# extra = lvq.get(timeout=1) +# self.fail("lvq-test not empty, contains: " + extra.body) +# except Empty: None +# #publish some more messages while subscriber is active (no replacement): +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C2")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C3")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A3")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A4")) +# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C4")) +# #check that accepting replaced messages is safe +# session.message_accept(accepted) def phase3(self): session = self.session - #lvq recovery validation - session.queue_declare(queue="lvq-test", durable=True, passive=True) - session.message_subscribe(destination="lvq", queue="lvq-test") - lvq = session.incoming("lvq") - lvq.start() - accepted = RangedSet() - lvq.start() - for m in ["C4", "A4"]: - msg = lvq.get(timeout=1) - self.assertEquals(m, msg.body) - accepted.add(msg.id) - session.message_accept(accepted) - try: - extra = lvq.get(timeout=1) - self.fail("lvq-test not empty, contains: " + extra.body) - except Empty: None - session.message_cancel(destination="lvq") - session.queue_delete(queue="lvq-test") +# #lvq recovery validation +# session.queue_declare(queue="lvq-test", durable=True, passive=True) +# session.message_subscribe(destination="lvq", queue="lvq-test") +# lvq = session.incoming("lvq") +# lvq.start() +# accepted = RangedSet() +# lvq.start() +# for m in ["C4", "A4"]: +# msg = lvq.get(timeout=1) +# self.assertEquals(m, msg.body) +# accepted.add(msg.id) +# session.message_accept(accepted) +# try: +# extra = lvq.get(timeout=1) +# self.fail("lvq-test not empty, contains: " + extra.body) +# except Empty: None +# session.message_cancel(destination="lvq") +# session.queue_delete(queue="lvq-test") #check queues exists Modified: store/trunk/cpp/tests/python_tests/client_persistence.py =================================================================== --- store/trunk/cpp/tests/python_tests/client_persistence.py 2012-05-07 12:59:09 UTC (rev 4507) +++ store/trunk/cpp/tests/python_tests/client_persistence.py 2012-05-08 15:39:54 UTC (rev 4508) @@ -69,8 +69,8 @@ self.check_message(broker, "e", msg2, True) - def test_lvq(self): - """Test LVQ.""" + def test_legacy_lvq(self): + """Test legacy LVQ.""" broker = self.broker(store_args(), name="test_lvq", expect=EXPECT_EXIT_OK) ma1 = Message("A1", durable=True, correlation_id="Msg0005", properties={"qpid.LVQ_key":"A"}) ma2 = Message("A2", durable=True, correlation_id="Msg0006", properties={"qpid.LVQ_key":"A"}) @@ -95,8 +95,9 @@ broker.terminate() broker = self.broker(store_args(), name="test_lvq") - self.check_messages(broker, "lvq-test", [mc4, ma4], True) - + self.check_messages(broker, "lvq-test", [ma4, mc4], True) + + def test_fanout_exchange(self): """Test Fanout Exchange""" broker = self.broker(store_args(), name="test_fanout_exchange", expect=EXPECT_EXIT_OK) Modified: store/trunk/cpp/tests/python_tests/store_test.py =================================================================== --- store/trunk/cpp/tests/python_tests/store_test.py 2012-05-07 12:59:09 UTC (rev 4507) +++ store/trunk/cpp/tests/python_tests/store_test.py 2012-05-08 15:39:54 UTC (rev 4508) @@ -341,6 +341,7 @@ if transactional: ssn.commit() return ssn + # Functions for finding strings in the broker log file (or other files)