Diffusion invenio-infoscience 363745982978

Merge branch 'master' into next
363745982978
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 27 2013, 14:31.

Description

Merge branch 'master' into next

master: BibAuthority: source file mode fix WebSubmit: source file mode fix BibAutority: fix for unit test suite global: InvenioTestCase in test suite

Conflicts:
modules/bibauthority/lib/bibauthority_regression_tests.py
modules/bibcatalog/lib/bibcatalog_system_email_unit_tests.py
modules/bibcatalog/lib/bibcatalog_system_rt_unit_tests.py
modules/bibcirculation/lib/bibcirculation_regression_tests.py
modules/bibclassify/lib/bibclassify_unit_tests.py
modules/bibconvert/lib/bibconvert_regression_tests.py
modules/bibconvert/lib/bibconvert_unit_tests.py
modules/bibdocfile/lib/bibdocfile_regression_tests.py
modules/bibedit/lib/bibedit_unit_tests.py
modules/bibexport/lib/bibexport_method_fieldexporter_unit_tests.py
modules/bibfield/lib/bibfield_config_engine_unit_tests.py
modules/bibfield/lib/bibfield_marcreader_regression_tests.py
modules/bibfield/lib/bibfield_regression_tests.py
modules/bibfield/lib/bibfield_utils_unit_tests.py
modules/bibfield/lib/functions/is_type_isbn_issn_unit_tests.py
modules/bibformat/lib/bibformat_engine_unit_tests.py
modules/bibformat/lib/bibformat_utils_unit_tests.py
modules/bibindex/lib/bibindex_engine_stemmer_unit_tests.py
modules/bibindex/lib/bibindex_engine_tokenizer_unit_tests.py
modules/bibindex/lib/bibindex_engine_unit_tests.py
modules/bibknowledge/lib/bibknowledge_regression_tests.py
modules/bibknowledge/lib/bibknowledge_unit_tests.py
modules/bibmatch/lib/bibmatch_regression_tests.py
modules/bibmatch/lib/bibmatch_unit_tests.py
modules/bibrank/lib/bibrank_citation_indexer_regression_tests.py
modules/bibrank/lib/bibrank_citation_searcher_unit_tests.py
modules/bibrank/lib/bibrank_citerank_indexer_unit_tests.py
modules/bibrank/lib/bibrank_downloads_indexer_unit_tests.py
modules/bibrank/lib/bibrank_record_sorter_unit_tests.py
modules/bibrank/lib/bibrank_regression_tests.py
modules/bibrank/lib/bibrank_selfcites_unit_tests.py
modules/bibrank/lib/bibrank_tag_based_indexer_unit_tests.py
modules/bibrecord/lib/bibrecord_unit_tests.py
modules/bibsort/lib/bibsort_engine_unit_tests.py
modules/bibsort/lib/bibsort_washer_unit_tests.py
modules/bibupload/lib/bibupload_regression_tests.py
modules/docextract/lib/docextract_webinterface_unit_tests.py
modules/docextract/lib/refextract_api_regression_tests.py
modules/docextract/lib/refextract_regression_tests.py
modules/docextract/lib/refextract_unit_tests.py
modules/elmsubmit/lib/elmsubmit_unit_tests.py
modules/miscutil/lib/dataciteutils_tester.py
modules/miscutil/lib/dateutils_unit_tests.py
modules/miscutil/lib/dbquery_regression_tests.py
modules/miscutil/lib/dbquery_unit_tests.py
modules/miscutil/lib/errorlib_regression_tests.py
modules/miscutil/lib/errorlib_unit_tests.py
modules/miscutil/lib/htmlutils_unit_tests.py
modules/miscutil/lib/importutils_unit_tests.py
modules/miscutil/lib/intbitset_unit_tests.py
modules/miscutil/lib/invenio_connector_regression_tests.py
modules/miscutil/lib/inveniocfg_unit_tests.py
modules/miscutil/lib/inveniocfg_upgrader_unit_tests.py
modules/miscutil/lib/jsonutils_unit_tests.py
modules/miscutil/lib/logicutils_unit_tests.py
modules/miscutil/lib/messages_unit_tests.py
modules/miscutil/lib/plotextractor_regression_tests.py
modules/miscutil/lib/plotextractor_unit_tests.py
modules/miscutil/lib/pluginutils_unit_tests.py
modules/miscutil/lib/shellutils_unit_tests.py
modules/miscutil/lib/solrutils_unit_tests.py
modules/miscutil/lib/testutils.py
modules/miscutil/lib/textutils_unit_tests.py
modules/miscutil/lib/urlutils_unit_tests.py
modules/miscutil/lib/web_api_key_regression_tests.py
modules/oairepository/lib/oai_repository_regression_tests.py
modules/oairepository/lib/oai_repository_unit_tests.py
modules/webaccess/lib/access_control_firerole_unit_tests.py
modules/webaccess/lib/external_authentication_cern_unit_tests.py
modules/webaccess/lib/webaccess_regression_tests.py
modules/webalert/lib/alert_engine_unit_tests.py
modules/webalert/lib/webalert_regression_tests.py
modules/webcomment/lib/webcomment_unit_tests.py
modules/webjournal/lib/webjournal_regression_tests.py
modules/webjournal/lib/webjournal_unit_tests.py
modules/weblinkback/lib/weblinkback_regression_tests.py
modules/weblinkback/lib/weblinkback_unit_tests.py
modules/webmessage/lib/webmessage_regression_tests.py
modules/webmessage/lib/webmessage_unit_tests.py
modules/websearch/lib/search_engine_query_parser_unit_tests.py
modules/websearch/lib/search_engine_summarizer_regression_tests.py
modules/websearch/lib/search_engine_unit_tests.py
modules/websearch/lib/websearch_external_collections_getter_unit_tests.py
modules/websearch/lib/websearch_external_collections_unit_tests.py
modules/websearch/lib/websearch_regression_tests.py
modules/websearch/lib/websearchadmin_regression_tests.py
modules/websession/lib/webgroup_regression_tests.py
modules/websession/lib/webgroup_unit_tests.py
modules/websession/lib/websession_regression_tests.py
modules/websession/lib/webuser_regression_tests.py
modules/webstyle/lib/webdoc_unit_tests.py
modules/webstyle/lib/webinterface_unit_tests.py
modules/webstyle/lib/webstyle_regression_tests.py
modules/websubmit/lib/websubmit_regression_tests.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 27 2013, 14:31

Parents

R3600:4a2c28f7f3e1: BibAuthority: source file mode fix
R3600:a6e67115b934: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:363745982978: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 27 2013, 14:31

Merged Changes

Commit	Author	Details	Committed
4a2c28f7f3e1	Tibor Simko	BibAuthority: source file mode fix	Nov 27 2013
0daf24e94388	Tibor Simko	WebSubmit: source file mode fix	Nov 27 2013
c6b65a50cfc7	Tibor Simko	BibAutority: fix for unit test suite	Nov 27 2013
f63b7e74eeca	Tibor Simko	global: InvenioTestCase in test suite	Nov 27 2013

Changes (85)

				Path
	M			modules/bibauthority/Makefile.am
	M			modules/bibauthority/bin/Makefile.am
	M			modules/bibauthority/doc/Makefile.am
	M			modules/bibauthority/doc/admin/Makefile.am
	M			modules/bibauthority/doc/admin/bibauthority-admin-guide.webdoc
	M			modules/bibauthority/doc/hacking/Makefile.am
	M			modules/bibauthority/doc/hacking/bibauthority-internals.webdoc
	M			modules/bibauthority/lib/Makefile.am
	M			modules/bibauthority/lib/bibauthority_config.py
	M			modules/bibauthority/lib/bibauthority_engine.py
	M			modules/bibauthority/lib/bibauthority_regression_tests.py
	V			modules/bibauthority/lib/{bibauthority_tests.py → bibauthority_unit_tests.py}
	V			modules/bibauthority/lib/{bibauthority_unit_tests.py ← bibauthority_tests.py}
	M			modules/bibauthority/web/Makefile.am
	M			modules/bibcatalog/lib/bibcatalog_system_rt_unit_tests.py
	M			modules/bibdocfile/lib/bibdocfile_regression_tests.py
	M			modules/bibedit/lib/bibedit_regression_tests.py
	M			modules/bibedit/lib/bibedit_unit_tests.py
	M			modules/bibencode/lib/bibencode_tester.py
	M			modules/bibformat/lib/bibformat_engine_unit_tests.py
	M			modules/bibformat/lib/bibformat_regression_tests.py
	M			modules/bibformat/lib/bibformatadmin_regression_tests.py
	M			modules/bibformat/lib/elements/bfe_authority_author.py
	M			modules/bibformat/lib/elements/bfe_authority_control_no.py
	M			modules/bibformat/lib/elements/bfe_authority_institution.py
	M			modules/bibformat/lib/elements/bfe_authority_journal.py
	M			modules/bibformat/lib/elements/bfe_authority_subject.py
	M			modules/bibindex/lib/bibindex_engine_stemmer_unit_tests.py
	M			modules/bibindex/lib/bibindex_engine_tokenizer_unit_tests.py
	M			modules/bibindex/lib/bibindex_regression_tests.py
	M			modules/bibindex/lib/bibindexadmin_regression_tests.py
	M			modules/bibknowledge/lib/bibknowledge_unit_tests.py
	M			modules/bibmatch/lib/bibmatch_regression_tests.py
	M			modules/bibrank/lib/bibrank_citation_searcher_unit_tests.py
	M			modules/bibrank/lib/bibrank_citerank_indexer_unit_tests.py
	M			modules/bibrank/lib/bibrank_downloads_indexer_unit_tests.py
	M			modules/bibrank/lib/bibrank_record_sorter_unit_tests.py
	M			modules/bibrank/lib/bibrank_selfcites_regression_tests.py
	M			modules/bibrank/lib/bibrank_selfcites_unit_tests.py
	M			modules/bibrank/lib/bibrank_tag_based_indexer_unit_tests.py
	M			modules/bibrank/lib/bibrankadmin_regression_tests.py
	M			modules/bibrecord/lib/bibrecord_unit_tests.py
	M			modules/bibsort/lib/bibsort_engine_unit_tests.py
	M			modules/bibsort/lib/bibsort_washer_unit_tests.py
	M			modules/bibsword/lib/bibsword_client_tester.py
	M			modules/bibupload/lib/batchuploader_regression_tests.py
	M			modules/docextract/lib/docextract_webinterface_unit_tests.py
	M			modules/elmsubmit/lib/elmsubmit_unit_tests.py
	M			modules/miscutil/lib/dataciteutils_tester.py
	M			modules/miscutil/lib/dbquery_unit_tests.py
	M			modules/miscutil/lib/errorlib_unit_tests.py
	M			modules/miscutil/lib/htmlutils_unit_tests.py
	M			modules/miscutil/lib/intbitset_unit_tests.py
	M			modules/miscutil/lib/inveniocfg_unit_tests.py
	M			modules/miscutil/lib/jsonutils_unit_tests.py
	M			modules/miscutil/lib/logicutils_unit_tests.py
	M			modules/miscutil/lib/memoiseutils_unit_tests.py
	M			modules/miscutil/lib/messages_unit_tests.py
	M			modules/miscutil/lib/plotextractor_regression_tests.py
	M			modules/miscutil/lib/plotextractor_unit_tests.py
	M			modules/miscutil/lib/pluginutils_unit_tests.py
	M			modules/miscutil/lib/sequtils_regression_tests.py
	M			modules/miscutil/lib/shellutils_unit_tests.py
	M			modules/miscutil/lib/solrutils_regression_tests.py
	M			modules/miscutil/lib/solrutils_unit_tests.py
	M			modules/miscutil/lib/testutils_regression_tests.py
	M			modules/oaiharvest/lib/oai_harvest_admin_regression_tests.py
	M			modules/oairepository/lib/oai_repository_admin_regression_tests.py
	M			modules/oairepository/lib/oai_repository_regression_tests.py
	M			modules/oairepository/lib/oai_repository_unit_tests.py
	M			modules/webalert/lib/alert_engine_unit_tests.py
	M			modules/webbasket/lib/webbasket_regression_tests.py
	M			modules/webcomment/lib/webcomment_regression_tests.py
	M			modules/webjournal/lib/webjournal_unit_tests.py
	M			modules/webmessage/lib/webmessage_unit_tests.py
	M			modules/websearch/lib/websearch_external_collections_getter_unit_tests.py
	M			modules/websession/lib/webgroup_regression_tests.py
	M			modules/websession/lib/webgroup_unit_tests.py
	M			modules/websession/lib/websession_regression_tests.py
	M			modules/websession/lib/webuser_regression_tests.py
	M			modules/webstat/lib/webstat_regression_tests.py
	M			modules/webstyle/lib/webdoc_unit_tests.py
	M			modules/webstyle/lib/webinterface_unit_tests.py
	M			modules/websubmit/lib/websubmitadmin_regression_tests.py
	M			modules/websubmit/lib/websubmitadmincli.py

Merge branch 'master' into next363745982978Actions

Description

Details

Event Timeline

Merged Changes

Changes (85)

R3600:363745982978

modules/bibauthority/Makefile.am

modules/bibauthority/bin/Makefile.am

modules/bibauthority/doc/Makefile.am

modules/bibauthority/doc/admin/Makefile.am

modules/bibauthority/doc/admin/bibauthority-admin-guide.webdoc

modules/bibauthority/doc/hacking/Makefile.am

modules/bibauthority/doc/hacking/bibauthority-internals.webdoc

modules/bibauthority/lib/Makefile.am

modules/bibauthority/lib/bibauthority_config.py

modules/bibauthority/lib/bibauthority_engine.py

modules/bibauthority/lib/bibauthority_regression_tests.py

modules/bibauthority/lib/bibauthority_tests.py

modules/bibauthority/lib/bibauthority_unit_tests.py

modules/bibauthority/web/Makefile.am

modules/bibcatalog/lib/bibcatalog_system_rt_unit_tests.py

modules/bibdocfile/lib/bibdocfile_regression_tests.py

modules/bibedit/lib/bibedit_regression_tests.py

modules/bibedit/lib/bibedit_unit_tests.py

modules/bibencode/lib/bibencode_tester.py

modules/bibformat/lib/bibformat_engine_unit_tests.py

modules/bibformat/lib/bibformat_regression_tests.py

modules/bibformat/lib/bibformatadmin_regression_tests.py

modules/bibformat/lib/elements/bfe_authority_author.py

modules/bibformat/lib/elements/bfe_authority_control_no.py

modules/bibformat/lib/elements/bfe_authority_institution.py

modules/bibformat/lib/elements/bfe_authority_journal.py

modules/bibformat/lib/elements/bfe_authority_subject.py

modules/bibindex/lib/bibindex_engine_stemmer_unit_tests.py

modules/bibindex/lib/bibindex_engine_tokenizer_unit_tests.py

modules/bibindex/lib/bibindex_regression_tests.py

modules/bibindex/lib/bibindexadmin_regression_tests.py

modules/bibknowledge/lib/bibknowledge_unit_tests.py

modules/bibmatch/lib/bibmatch_regression_tests.py

modules/bibrank/lib/bibrank_citation_searcher_unit_tests.py

modules/bibrank/lib/bibrank_citerank_indexer_unit_tests.py

modules/bibrank/lib/bibrank_downloads_indexer_unit_tests.py

modules/bibrank/lib/bibrank_record_sorter_unit_tests.py

modules/bibrank/lib/bibrank_selfcites_regression_tests.py

modules/bibrank/lib/bibrank_selfcites_unit_tests.py

modules/bibrank/lib/bibrank_tag_based_indexer_unit_tests.py

modules/bibrank/lib/bibrankadmin_regression_tests.py

modules/bibrecord/lib/bibrecord_unit_tests.py

modules/bibsort/lib/bibsort_engine_unit_tests.py

modules/bibsort/lib/bibsort_washer_unit_tests.py

modules/bibsword/lib/bibsword_client_tester.py

modules/bibupload/lib/batchuploader_regression_tests.py

modules/docextract/lib/docextract_webinterface_unit_tests.py

modules/elmsubmit/lib/elmsubmit_unit_tests.py

modules/miscutil/lib/dataciteutils_tester.py

modules/miscutil/lib/dbquery_unit_tests.py

modules/miscutil/lib/errorlib_unit_tests.py

modules/miscutil/lib/htmlutils_unit_tests.py

modules/miscutil/lib/intbitset_unit_tests.py

modules/miscutil/lib/inveniocfg_unit_tests.py

modules/miscutil/lib/jsonutils_unit_tests.py

modules/miscutil/lib/logicutils_unit_tests.py

modules/miscutil/lib/memoiseutils_unit_tests.py

modules/miscutil/lib/messages_unit_tests.py

modules/miscutil/lib/plotextractor_regression_tests.py

modules/miscutil/lib/plotextractor_unit_tests.py

modules/miscutil/lib/pluginutils_unit_tests.py

modules/miscutil/lib/sequtils_regression_tests.py

modules/miscutil/lib/shellutils_unit_tests.py

modules/miscutil/lib/solrutils_regression_tests.py

modules/miscutil/lib/solrutils_unit_tests.py

modules/miscutil/lib/testutils_regression_tests.py

modules/oaiharvest/lib/oai_harvest_admin_regression_tests.py

modules/oairepository/lib/oai_repository_admin_regression_tests.py

modules/oairepository/lib/oai_repository_regression_tests.py

modules/oairepository/lib/oai_repository_unit_tests.py

modules/webalert/lib/alert_engine_unit_tests.py

modules/webbasket/lib/webbasket_regression_tests.py

modules/webcomment/lib/webcomment_regression_tests.py

Merge branch 'master' into next
363745982978
Actions