November 2009 - rhmessaging-commits

rhmessaging commits: r3721 - mgmt/trunk/cumin/resources.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2009-11-24 11:55:58 -0500 (Tue, 24 Nov 2009) New Revision: 3721 Modified: mgmt/trunk/cumin/resources/slots.swf Log: Fix for system label position. Now calculates based on number of systems instead of a fixed offset. Modified: mgmt/trunk/cumin/resources/slots.swf =================================================================== (Binary files differ)

15 years, 1 month

1
0
0 / 0

RECOVERY: C8995-rhmessaging-commits/is OK

by Van Briggs

15 years, 1 month

1
0
0 / 0

Support Ticket: 34091ADM - Created

by Marcie Hearn

15 years, 1 month

1
0
0 / 0

rhmessaging commits: r3720 - in mgmt/trunk/cumin/python/cumin: grid and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2009-11-19 17:12:15 -0500 (Thu, 19 Nov 2009) New Revision: 3720 Modified: mgmt/trunk/cumin/python/cumin/grid/main.py mgmt/trunk/cumin/python/cumin/messaging/main.py mgmt/trunk/cumin/python/cumin/widgets.py Log: Avoid loop in CuminView.do_process. Change to more descriptive names. Modified: mgmt/trunk/cumin/python/cumin/grid/main.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/main.py 2009-11-19 21:27:02 UTC (rev 3719) +++ mgmt/trunk/cumin/python/cumin/grid/main.py 2009-11-19 22:12:15 UTC (rev 3720) @@ -75,7 +75,7 @@ self.pool = PoolFrame(app, "pool") self.add_mode(self.pool) - self.sticky = self.pool.view + self.add_sticky_view(self.pool) def render_title(self, session): return "Grid" Modified: mgmt/trunk/cumin/python/cumin/messaging/main.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/main.py 2009-11-19 21:27:02 UTC (rev 3719) +++ mgmt/trunk/cumin/python/cumin/messaging/main.py 2009-11-19 22:12:15 UTC (rev 3720) @@ -85,7 +85,7 @@ self.broker = BrokerFrame(app, "broker") self.add_mode(self.broker) - self.sticky = self.broker.view + self.add_sticky_view(self.broker) self.broker_group = BrokerGroupFrame(app, "group") self.add_mode(self.broker_group) Modified: mgmt/trunk/cumin/python/cumin/widgets.py =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.py 2009-11-19 21:27:02 UTC (rev 3719) +++ mgmt/trunk/cumin/python/cumin/widgets.py 2009-11-19 22:12:15 UTC (rev 3720) @@ -73,10 +73,10 @@ return lsess.marshal() def render_tab_href(self, session, tab): - if tab.sticky: + if tab.sticky_view: try: obj = session.client_session.attributes["sticky_%s" % tab.name] - return tab.sticky.frame.get_href(session, obj) + return tab.sticky_view.frame.get_href(session, obj) except KeyError: pass @@ -135,7 +135,7 @@ def __init__(self, app, name): super(CuminFrame, self).__init__(app, name) - self.sticky = None + self.sticky_view = None self.object = None self.__view = None self.__add = None @@ -169,6 +169,10 @@ self.show_object(branch, object) return branch.marshal() + def add_sticky_view(self, frame): + self.sticky_view = frame.view + frame.view.sticky_frame = self + def render_href(self, session, *args): branch = session.branch() @@ -194,6 +198,7 @@ self.add_child(summary) self.__frame_tmpl = Template(self, "frame_html") + self.sticky_frame = None def render_script(self, session): return None @@ -229,14 +234,9 @@ return html def do_process(self, session): - for frame in self.ancestors: - try: - if frame.sticky == self: - session.client_session.attributes["sticky_%s" % \ - frame.name] = self.frame.object.get(session) - except AttributeError: - pass - + if self.sticky_frame: + session.client_session.attributes["sticky_%s" % \ + self.sticky_frame.name] = self.frame.object.get(session) super(CuminView, self).do_process(session) class BackgroundInclude(Widget):

15 years, 1 month

1
0
0 / 0

rhmessaging commits: r3719 - in mgmt/trunk/cumin/python/cumin: grid and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2009-11-19 16:27:02 -0500 (Thu, 19 Nov 2009) New Revision: 3719 Modified: mgmt/trunk/cumin/python/cumin/grid/main.py mgmt/trunk/cumin/python/cumin/grid/pool.py mgmt/trunk/cumin/python/cumin/messaging/main.py mgmt/trunk/cumin/python/cumin/widgets.py Log: More general implementation of sticky views. Modified: mgmt/trunk/cumin/python/cumin/grid/main.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/main.py 2009-11-19 17:49:57 UTC (rev 3718) +++ mgmt/trunk/cumin/python/cumin/grid/main.py 2009-11-19 21:27:02 UTC (rev 3719) @@ -75,6 +75,7 @@ self.pool = PoolFrame(app, "pool") self.add_mode(self.pool) + self.sticky = self.pool.view def render_title(self, session): return "Grid" Modified: mgmt/trunk/cumin/python/cumin/grid/pool.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/pool.py 2009-11-19 17:49:57 UTC (rev 3718) +++ mgmt/trunk/cumin/python/cumin/grid/pool.py 2009-11-19 21:27:02 UTC (rev 3719) @@ -139,9 +139,6 @@ def do_process(self, session): self.limits.limit_count.process(session) - sticky = self.pool.get(session) - session.client_session.attributes["sticky_pool"] = sticky - super(PoolView, self).do_process(session) class PoolSubmissionSet(SubmissionSet): Modified: mgmt/trunk/cumin/python/cumin/messaging/main.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/main.py 2009-11-19 17:49:57 UTC (rev 3718) +++ mgmt/trunk/cumin/python/cumin/messaging/main.py 2009-11-19 21:27:02 UTC (rev 3719) @@ -85,6 +85,7 @@ self.broker = BrokerFrame(app, "broker") self.add_mode(self.broker) + self.sticky = self.broker.view self.broker_group = BrokerGroupFrame(app, "group") self.add_mode(self.broker_group) Modified: mgmt/trunk/cumin/python/cumin/widgets.py =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.py 2009-11-19 17:49:57 UTC (rev 3718) +++ mgmt/trunk/cumin/python/cumin/widgets.py 2009-11-19 21:27:02 UTC (rev 3719) @@ -73,10 +73,10 @@ return lsess.marshal() def render_tab_href(self, session, tab): - if tab.name == "grid": + if tab.sticky: try: - pool = session.client_session.attributes["sticky_pool"] - return self.page.main.grid.pool.get_href(session, pool) + obj = session.client_session.attributes["sticky_%s" % tab.name] + return tab.sticky.frame.get_href(session, obj) except KeyError: pass @@ -135,6 +135,7 @@ def __init__(self, app, name): super(CuminFrame, self).__init__(app, name) + self.sticky = None self.object = None self.__view = None self.__add = None @@ -227,6 +228,17 @@ return html + def do_process(self, session): + for frame in self.ancestors: + try: + if frame.sticky == self: + session.client_session.attributes["sticky_%s" % \ + frame.name] = self.frame.object.get(session) + except AttributeError: + pass + + super(CuminView, self).do_process(session) + class BackgroundInclude(Widget): def __init__(self, app, name): super(BackgroundInclude, self).__init__(app, name)

15 years, 1 month

1
0
0 / 0

rhmessaging commits: r3718 - in store/trunk/cpp: tests/cluster and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: aconway Date: 2009-11-19 12:49:57 -0500 (Thu, 19 Nov 2009) New Revision: 3718 Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp store/trunk/cpp/lib/MessageStoreImpl.h store/trunk/cpp/tests/cluster/cluster_tests_env.sh store/trunk/cpp/tests/cluster/run_cluster_tests Log: Added getStoreDir() to MessageStore Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-11-18 19:49:32 UTC (rev 3717) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-11-19 17:49:57 UTC (rev 3718) @@ -1869,6 +1869,8 @@ return dir.str(); } +std::string MessageStoreImpl::getStoreDir() const { return storeDir; } + MessageStoreImpl::StoreOptions::StoreOptions(const std::string& name) : qpid::Options(name), numJrnlFiles(defNumJrnlFiles), Modified: store/trunk/cpp/lib/MessageStoreImpl.h =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.h 2009-11-18 19:49:32 UTC (rev 3717) +++ store/trunk/cpp/lib/MessageStoreImpl.h 2009-11-19 17:49:57 UTC (rev 3718) @@ -381,6 +381,8 @@ inline qpid::management::Manageable::status_t ManagementMethod (u_int32_t, qpid::management::Args&) { return qpid::management::Manageable::STATUS_OK; } + + std::string getStoreDir() const; }; // class MessageStoreImpl } // namespace msgstore Modified: store/trunk/cpp/tests/cluster/cluster_tests_env.sh =================================================================== --- store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2009-11-18 19:49:32 UTC (rev 3717) +++ store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2009-11-19 17:49:57 UTC (rev 3718) @@ -133,6 +133,7 @@ export QPIDD_EXEC="${QPID_BLD}/src/qpidd" export QPID_CONFIG_EXEC="${QPID_DIR}/python/commands/qpid-config" export QPID_ROUTE_EXEC="${QPID_DIR}/python/commands/qpid-route" + export QPID_CLUSTER_EXEC="${QPID_DIR}/python/commands/qpid-cluster" export RECEIVER_EXEC="${QPID_BLD}/src/tests/receiver" export SENDER_EXEC="${QPID_BLD}/src/tests/sender" @@ -153,8 +154,8 @@ func_checkpaths QPID_BIN_DIR QPID_SBIN_DIR QPID_LIB_DIR QPID_LIBEXEC_DIR # Paths and dirs - export PYTHON_DIR="${QPID_BIN_DIR}" - export PYTHONPATH="${PYTHONPATH}":"${QPID_LIB_DIR}/python":"${QPID_LIBEXEC_DIR}/qpid/tests":"${QPID_LIB_DIR}/python2.4" + export PYTHON_DIR="${QPID_BIN_DIR}" + export PYTHONPATH="${PYTHONPATH}":"${QPID_LIB_DIR}/python":"${QPID_LIBEXEC_DIR}/qpid/tests":"${QPID_LIB_DIR}/python2.4" # Libraries Modified: store/trunk/cpp/tests/cluster/run_cluster_tests =================================================================== --- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-11-18 19:49:32 UTC (rev 3717) +++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-11-19 17:49:57 UTC (rev 3718) @@ -29,10 +29,11 @@ echo "Running Python cluster tests..." OUTDIR=brokertest.tmp rm -rf $OUTDIR -CLUSTER_TEST="${PYTHON_DIR}/qpid-python-test -m cluster_tests -I ${CLUSTER_TESTS_FAIL} -DOUTDIR=$OUTDIR" +# Ignore tests requiring a store by default. +CLUSTER_TESTS_IGNORE=${CLUSTER_TESTS_IGNORE:-I ${CLUSTER_TESTS_FAIL}} +CLUSTER_TESTS=${CLUSTER_TESTS:-$*} - -sg ais -c "${CLUSTER_TEST}" +sg ais -c "${PYTHON_DIR}/qpid-python-test -m cluster_tests ${CLUSTER_TESTS_IGNORE} ${CLUSTER_TESTS} -DOUTDIR=$OUTDIR" RETCODE=$? if test x${RETCODE} != x0; then

15 years, 1 month

1
0
0 / 0

rhmessaging commits: r3717 - in mgmt/trunk/cumin/python/cumin: grid and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2009-11-18 14:49:32 -0500 (Wed, 18 Nov 2009) New Revision: 3717 Modified: mgmt/trunk/cumin/python/cumin/grid/pool.py mgmt/trunk/cumin/python/cumin/widgets.py Log: Restore sticky pool for Grid tab using client_session Modified: mgmt/trunk/cumin/python/cumin/grid/pool.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/pool.py 2009-11-18 14:45:15 UTC (rev 3716) +++ mgmt/trunk/cumin/python/cumin/grid/pool.py 2009-11-18 19:49:32 UTC (rev 3717) @@ -56,7 +56,6 @@ def render_content(self, session, data): pool = Identifiable(data["id"]) href = self.page.main.grid.pool.get_href(session, pool) - return fmt_link(href, data["name"]) class JobsRunningColumn(SqlTableColumn): @@ -140,6 +139,8 @@ def do_process(self, session): self.limits.limit_count.process(session) + sticky = self.pool.get(session) + session.client_session.attributes["sticky_pool"] = sticky super(PoolView, self).do_process(session) Modified: mgmt/trunk/cumin/python/cumin/widgets.py =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.py 2009-11-18 14:45:15 UTC (rev 3716) +++ mgmt/trunk/cumin/python/cumin/widgets.py 2009-11-18 19:49:32 UTC (rev 3717) @@ -73,6 +73,13 @@ return lsess.marshal() def render_tab_href(self, session, tab): + if tab.name == "grid": + try: + pool = session.client_session.attributes["sticky_pool"] + return self.page.main.grid.pool.get_href(session, pool) + except KeyError: + pass + branch = session.branch() tab.mode.set(branch, None) tab.show(branch)

15 years, 1 month

1
0
0 / 0

Dear rhmessaging-commits@lists.jboss.org SALE 80% OFF on Pfizer

by Pfizer Inc

15 years, 1 month

1
0
0 / 0

rhmessaging commits: r3716 - store/trunk/cpp/tests/jrnl/jtt.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2009-11-18 09:45:15 -0500 (Wed, 18 Nov 2009) New Revision: 3716 Modified: store/trunk/cpp/tests/jrnl/jtt/args.cpp store/trunk/cpp/tests/jrnl/jtt/args.hpp store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp Log: Some fixes to the jtt tool. Modified: store/trunk/cpp/tests/jrnl/jtt/args.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/args.cpp 2009-11-17 16:39:29 UTC (rev 3715) +++ store/trunk/cpp/tests/jrnl/jtt/args.cpp 2009-11-18 14:45:15 UTC (rev 3716) @@ -70,13 +70,13 @@ ("lld-rd-num", po::value<unsigned>(&lld_rd_num)->default_value(10), - "Number of consecutive messages to read after only dequeueing <lld-skip-num> " + "Number of consecutive messages to read after only dequeueing lld-skip-num " "messages during lazy-loading. Ignored if read-mode is not set to LAZYLOAD.") ("lld-skip-num", po::value<unsigned>(&lld_skip_num)->default_value(100), "Number of consecutive messages to dequeue only (without reading) prior to " - "reading <lld-rd-num> messages. Ignored if read-mode is not set to LAZYLOAD.") + "reading lld-rd-num messages. Ignored if read-mode is not set to LAZYLOAD.") ("num-jrnls", po::value<unsigned>(&num_jrnls)->default_value(1), @@ -88,7 +88,7 @@ ("randomize", po::value<bool>(&randomize)->zero_tokens(), - "Randomize the order of the test case execution.") + "Randomize the order of the tests.") ("read-mode", po::value<read_arg>(&read_mode)->default_value(read_arg::NONE), @@ -104,7 +104,7 @@ ("repeat", po::value<bool>(&repeat_flag)->zero_tokens(), - "Repeat all test cases in CSV file indefinitely.") + "Repeat all test cases indefinitely.") ("reuse-instance", po::value<bool>(&reuse_instance)->zero_tokens(), @@ -114,9 +114,9 @@ po::value<unsigned>(&seed)->default_value(0), "Seed for use in random number generator.") - ("ja-path", - po::value<std::string>(&jfile_analyze_path), - "Path to jfile_analyze file.") + ("analyzer", + po::value<std::string>(&jfile_analyzer)->default_value("./file_chk.py"), + "Journal file analyzer program to use when the --format-chk option is used, ignored otherwise.") ; } Modified: store/trunk/cpp/tests/jrnl/jtt/args.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/args.hpp 2009-11-17 16:39:29 UTC (rev 3715) +++ store/trunk/cpp/tests/jrnl/jtt/args.hpp 2009-11-18 14:45:15 UTC (rev 3716) @@ -38,7 +38,7 @@ boost::program_options::variables_map _vmap; // Add args here - std::string jfile_analyze_path; + std::string jfile_analyzer; std::string test_case_csv_file_name; std::string journal_dir; bool format_chk; Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2009-11-17 16:39:29 UTC (rev 3715) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2009-11-18 14:45:15 UTC (rev 3716) @@ -36,7 +36,7 @@ _tc_average(true), _fmt_chk_done(false), _fmt_chk_err(false), - _rlist() + _res_list() { } @@ -45,7 +45,7 @@ _tc_average(false), _fmt_chk_done(false), _fmt_chk_err(false), - _rlist() + _res_list() {} test_case_result_agregation::~test_case_result_agregation() @@ -61,14 +61,14 @@ _num_read += tcrp->num_read(); add_test_time(tcrp->test_time()); _exception_list.insert(_exception_list.end(), tcrp->begin(), tcrp->end()); - _rlist.push_back(tcrp); + _res_list.push_back(tcrp); } } bool test_case_result_agregation::exception() const { - for (tcrp_list_citr i = _rlist.begin(); i < _rlist.end(); i++) + for (tcrp_list_citr i = _res_list.begin(); i < _res_list.end(); i++) if ((*i)->exception()) return true; return false; @@ -78,7 +78,7 @@ test_case_result_agregation::exception_count() const { unsigned cnt = 0; - for (tcrp_list_citr i = _rlist.begin(); i < _rlist.end(); i++) + for (tcrp_list_citr i = _res_list.begin(); i < _res_list.end(); i++) cnt += (*i)->exception_count(); return cnt; } @@ -87,7 +87,7 @@ test_case_result_agregation::clear() { test_case_result::clear(); - _rlist.clear(); + _res_list.clear(); } const std::string @@ -95,13 +95,13 @@ { std::ostringstream oss; if (last_only) - oss << " " << _rlist.at(_rlist.size()-1)->str(summary); + oss << " " << _res_list.at(_res_list.size()-1)->str(summary); else { - for (tcrp_list_citr i=_rlist.begin(); i!=_rlist.end(); i++) + for (tcrp_list_citr i=_res_list.begin(); i!=_res_list.end(); i++) oss << " " << (*i)->str(summary); } - if (_rlist.size() > 1) + if (_res_list.size() > 1) oss << " " << (summary ? str_summary(last_only) : str_full(last_only)); return oss.str(); } @@ -115,9 +115,9 @@ oss << "Average across all journal instances:" << std::endl; else oss << "Average for jid=\"" << _jid << "\":" << std::endl; - oss << " total number results: " << _rlist.size() << std::endl; + oss << " total number results: " << _res_list.size() << std::endl; oss << " number exceptions: " << _exception_list.size() << " (" << - (100.0 * _rlist.size() / _exception_list.size()) << "%)" << std::endl; + (100.0 * _res_list.size() / _exception_list.size()) << "%)" << std::endl; oss << test_case_result::str_full(); @@ -129,10 +129,10 @@ oss << " " << n << ". " << (*i) << std::endl; } - if (!_tc_average && _rlist.size() > 1) + if (!_tc_average && _res_list.size() > 1) { oss << "Individual results:" << std::endl; - for (tcrp_list_citr i=_rlist.begin(); i!=_rlist.end(); i++) + for (tcrp_list_citr i=_res_list.begin(); i!=_res_list.end(); i++) oss << " " << (*i)->str(false) << std::endl; oss << std::endl; } @@ -145,13 +145,13 @@ { std::ostringstream oss; if (_tc_average) - oss << "overall average [" << _rlist.size() << "]:"; + oss << "overall average [" << _res_list.size() << "]:"; else - oss << "average (" << _rlist.size() << "):"; + oss << "average (" << _res_list.size() << "):"; oss << test_case_result::str_summary(); if (_fmt_chk_done) - oss << " fmt-chk=" << (_fmt_chk_err ? "ok" : "fail"); + oss << " fmt-chk=" << (_fmt_chk_err ? "fail" : "ok"); if (_exception_list.size()) { Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp 2009-11-17 16:39:29 UTC (rev 3715) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp 2009-11-18 14:45:15 UTC (rev 3716) @@ -26,6 +26,7 @@ #include "test_case_result.hpp" +#include <iostream> #include <vector> namespace mrg @@ -45,7 +46,7 @@ bool _tc_average; bool _fmt_chk_done; bool _fmt_chk_err; - tcrp_list _rlist; + tcrp_list _res_list; public: test_case_result_agregation(); // used for average across jrnl instances @@ -58,12 +59,12 @@ inline bool fmt_chk_done() const { return _fmt_chk_done; } inline bool fmt_chk_res() const { return _fmt_chk_err; } inline void set_fmt_chk_res(const bool err) - { _fmt_chk_done = true; if (!_fmt_chk_err && err) _fmt_chk_err = err; } - inline u_int32_t num_results() const { return _rlist.size(); } - inline tcrp_list_citr rlist_begin() const { return _rlist.begin(); } - inline tcrp_list_citr rlist_end() const { return _rlist.end(); } + { _fmt_chk_done = true; _fmt_chk_err |= err; if (err) add_exception("Journal format error"); } + inline u_int32_t num_results() const { return _res_list.size(); } + inline tcrp_list_citr rlist_begin() const { return _res_list.begin(); } + inline tcrp_list_citr rlist_end() const { return _res_list.end(); } inline const test_case_result::shared_ptr& operator[](unsigned i) const - { return _rlist[i]; } + { return _res_list[i]; } bool exception() const; unsigned exception_count() const; Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2009-11-17 16:39:29 UTC (rev 3715) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2009-11-18 14:45:15 UTC (rev 3716) @@ -25,6 +25,7 @@ #include <cstdlib> #include <iostream> +#include <sys/stat.h> #include "test_case_set.hpp" namespace mrg @@ -97,18 +98,22 @@ (*jii)->run_tc(); for (ji_list_citr jii=_ji_list.begin(); jii!=_ji_list.end(); jii++) (*jii)->tc_wait_compl(); + if (_args.format_chk) { for (ji_list_citr jii=_ji_list.begin(); jii!=_ji_list.end(); jii++) { jrnl_init_params::shared_ptr jpp = (*jii)->params(); - std::string path = _args.jfile_analyze_path; - if (path.empty()) path = "."; - if (path[path.size()-1] != '/') path += "/"; + std::string ja = _args.jfile_analyzer; + if (ja.empty()) ja = "./jfile_chk.py"; + if (!exists(ja)) + { + std::ostringstream oss; + oss << "ERROR: Validation program \"" << ja << "\" does not exist" << std::endl; + throw std::runtime_error(oss.str()); + } std::ostringstream oss; - oss << path << "jfile_chk.py -q"; - oss << " -d " << jpp->jdir(); - oss << " -b " << jpp->base_filename(); + oss << ja << " -q -d " << jpp->jdir() << " -b " << jpp->base_filename(); // TODO: When jfile_check.py can handle previously recovered journals for // specific tests, then remove this exclusion. if (!_args.recover_mode) @@ -116,10 +121,12 @@ oss << " -c" << _args.test_case_csv_file_name; oss << " -t" << (*tci)->test_case_num(); } - bool res = system(oss.str().c_str()) == 0; - (*tci)->set_fmt_chk_res(res, jpp->jid()); + bool res = system(oss.str().c_str()) != 0; + (*tci)->set_fmt_chk_res(res, jpp->jid()); + if (res) _err_flag = true; } } + if (!_args.recover_mode && !_args.keep_jrnls) for (ji_list_citr jii=_ji_list.begin(); jii!=_ji_list.end(); jii++) try { mrg::journal::jdir::delete_dir((*jii)->jrnl_dir()); } @@ -154,6 +161,22 @@ std::cout << "********************************" << std::endl << std::endl; } +bool +test_mgr::exists(std::string fname) +{ + struct stat s; + if (::stat(fname.c_str(), &s)) + { + if (errno == ENOENT) // No such dir or file + return false; + // Throw for any other condition + std::ostringstream oss; + oss << "ERROR: test_mgr::exists(): file=\"" << fname << "\": " << FORMAT_SYSERR(errno); + throw std::runtime_error(oss.str()); + } + return true; +} + void test_mgr::initialize_jrnls() { @@ -177,12 +200,12 @@ if (!summary) std::cout << " === Results ===" << std::endl; -// TODO - the reporting is broken when --repeat is used. The following commented-ot +// TODO - the reporting is broken when --repeat is used. The following commented-out // section was an attempt to fix it, but there are too many side-effects. // for (test_case::res_map_citr i=tcp->jmap_begin(); i!=tcp->jmap_end(); i++) // std::cout << (*i).second->str(summary, summary); // if (tcp->num_jrnls() > 1) - std::cout << tcp->average().str(false, summary); + std::cout << tcp->average().str(false, summary); if (!summary) std::cout << std::endl; Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2009-11-17 16:39:29 UTC (rev 3715) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2009-11-18 14:45:15 UTC (rev 3716) @@ -57,6 +57,7 @@ static void signal_handler(int signal); private: + static bool exists(std::string file_name); void initialize_jrnls(); void print_results(test_case::shared_ptr tcp, const bool summary); inline static ptrdiff_t random_fn(const ptrdiff_t i)

15 years, 1 month

1
0
0 / 0

rhmessaging commits: r3715 - mgmt/trunk/wooly/python/wooly.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2009-11-17 11:39:29 -0500 (Tue, 17 Nov 2009) New Revision: 3715 Modified: mgmt/trunk/wooly/python/wooly/forms.py Log: Changed the tabindex of the Submit and Cancel button to agree with their display order. Modified: mgmt/trunk/wooly/python/wooly/forms.py =================================================================== --- mgmt/trunk/wooly/python/wooly/forms.py 2009-11-17 16:24:19 UTC (rev 3714) +++ mgmt/trunk/wooly/python/wooly/forms.py 2009-11-17 16:39:29 UTC (rev 3715) @@ -498,11 +498,11 @@ self.add_parameter(self.return_url) self.submit_button = self.Submit(app, "submit") - self.submit_button.tab_index = 200 + self.submit_button.tab_index = 201 self.add_button(self.submit_button) self.cancel_button = self.Cancel(app, "cancel") - self.cancel_button.tab_index = 201 + self.cancel_button.tab_index = 200 self.add_button(self.cancel_button) def submit(self, session):

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits November 2009