[Fusionforge-commits] FusionForge branch master updated. c16d3a2e7cb9b2e9249240f84ce3245162b5b1f9

Roland Mas lolando at fusionforge.org
Mon Apr 28 14:24:22 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  c16d3a2e7cb9b2e9249240f84ce3245162b5b1f9 (commit)
       via  d382fd08e110eb51782b6033fda48ef94a6d3388 (commit)
      from  60878dd9b29c344bc877c0f6b9a9e84dd0046959 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c16d3a2e7cb9b2e9249240f84ce3245162b5b1f9
Author: Roland Mas <lolando at debian.org>
Date:   Mon Apr 28 14:24:17 2014 +0200

    Removed unused scripts

diff --git a/tests/CDXCentos52Tests.php b/tests/CDXCentos52Tests.php
deleted file mode 100644
index 9ec9d70..0000000
--- a/tests/CDXCentos52Tests.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
-	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'func/Testing/RPMSeleniumRemoteSuite.php';
-
-class CDXCentos52Tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new RPMSeleniumRemoteSuite('PHPUnit');
-
-		// Selenium tests
-	//	$suite->addTestFiles(glob("func/Site/*Test.php"));
-//		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
-//		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
-//		$suite->addTestFiles(glob("func/Docs/*Test.php"));
-//		$suite->addTestFiles(glob("func/Forums/*Test.php"));
-//		$suite->addTestFiles(glob("func/News/*Test.php"));
-//		$suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
-//		$suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
-//		$suite->addTestFiles(glob("func/RBAC/*Test.php"));
-//		$suite->addTestFiles(glob("func/Surveys/*Test.php"));
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
-	AllTests::main();
-}
diff --git a/tests/SeleniumTests.php b/tests/SeleniumTests.php
deleted file mode 100644
index 3fcc1b7..0000000
--- a/tests/SeleniumTests.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
-	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-if (!@include_once 'PHPUnit/Autoload.php') {
-	include_once 'PHPUnit/Framework.php';
-	require_once 'PHPUnit/TextUI/TestRunner.php';
-}
-
-class AllTests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('PHPUnit');
-
-		// Selenium tests
-		$suite->addTestFiles(glob("func/Site/*Test.php"));
-		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
-		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
-		$suite->addTestFiles(glob("func/Docs/*Test.php"));
-		$suite->addTestFiles(glob("func/Forums/*Test.php"));
-		$suite->addTestFiles(glob("func/News/*Test.php"));
-		$suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
-		$suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
-		$suite->addTestFiles(glob("func/RBAC/*Test.php"));
-		$suite->addTestFiles(glob("func/Search/*Test.php"));
-		$suite->addTestFiles(glob("func/Surveys/*Test.php"));
-
-		// Run any func tests available in the plugins
-		$suite->addTestFiles(glob("../src/plugins/*/tests/func/*Test.php"));
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
-	AllTests::main();
-}
diff --git a/tests/scripts/cdx40-build-and-test-source.sh b/tests/scripts/cdx40-build-and-test-source.sh
deleted file mode 100755
index 4190d0b..0000000
--- a/tests/scripts/cdx40-build-and-test-source.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#! /bin/sh -x
-export CURDIR=`pwd`
-export WORKSPACE=${WORKSPACE:-$CURDIR}
-
-export CONFIG_PHP=func/config.php.buildbot
-export SELENIUM_RC_HOST=${SELENIUM_RC_HOST:-`hostname -i`}
-export SELENIUM_RC_DIR=$WORKSPACE/reports
-
-export DEBMIRROR
-
-# get config
-. tests/config/default
-if [ -f tests/config/`hostname` ] ; then . tests/config/`hostname`; fi
-if [ ! -z "$1" ]
-then
-        export HOST=$1
-else
-	export HOST=cdx40.$DNSDOMAIN
-fi
-
-export LXCTEMPLATE=$LXCCOSTEMPLATE
-
-export DIST
-export VMENGINE
-export SSHPUBKEY
-export HOSTKEYDIR
-
-CDXVERS=Codendi_4.0
-CDXIP=`hostname -i`
-
-# Unit tests
-#sh $WORKSPACE/$CDXVERS/codendi_tools/ci_build.sh $HOST $CDXIP $CDXVERS
-
-if $KEEPVM
-then
-        echo "Destroying vm $HOST"
-        (cd tests/scripts ; sh ./stop_vm.sh $HOST || true)
-fi
-(cd tests/scripts ; ./start_vm.sh $HOST)
-
-[ ! -d $WORKSPACE/build ] || rm -fr $WORKSPACE/build
-[ ! -d $WORKSPACE/reports ] || rm -fr $WORKSPACE/reports
-mkdir -p $WORKSPACE/build/packages $WORKSPACE/build/config $WORKSPACE/reports/coverage
-
-cat > $WORKSPACE/build/config/phpunit <<-EOF
-HUDSON_URL=$HUDSON_URL
-JOB_NAME=$JOB_NAME
-EOF
-
-scp -r tests root@$HOST:/root
-scp -r $WORKSPACE/build/config  root@$HOST:/root
-(cd 3rd-party/selenium ; make getselenium)
-scp 3rd-party/selenium/binary/selenium-server-current/selenium-server.jar root@$HOST:/root
-
-# EPEL
-cp src/rpm-specific/epel-short.repo $WORKSPACE/build/packages/epel.repo
-if [ ! -z "$EPEL_REPO" ] ; then
-        sed -i "s#http://download.fedoraproject.org/pub/epel#${EPEL_REPO}#" $WORKSPACE/build/packages/epel.repo
-fi
-scp $WORKSPACE/build/packages/epel.repo root@$HOST:/etc/yum.repos.d/ 
-
-# DAG
-cp src/rpm-specific/dag-rpmforge.repo $WORKSPACE/build/packages/dag-rpmforge.repo
-if [ ! -z "$DAG_RPMFORGE_REPO" ] ; then
-        sed -i "s#http://apt.sw.be/redhat#${DAG_RPMFORGE_REPO}#" $WORKSPACE/build/packages/dag-rpmforge.repo
-	# disable dag by default
-        sed -i "s#enabled = 1#enabled = 0#" $WORKSPACE/build/packages/dag-rpmforge.repo
-fi
-scp $WORKSPACE/build/packages/dag-rpmforge.repo root@$HOST:/etc/yum.repos.d/ 
-
-#================
-CDXPACKAGES="mod_ssl vsftpd perl-DBI perl-DBD-MySQL gd sendmail telnet bind bind-chroot caching-nameserver ntp perl-suidperl python-devel rcs sendmail-cf perl-URI perl-HTML-Tagset perl-Digest-SHA1 perl-Digest-HMAC perl-Socket6 perl-HTML-Parser perl-libwww-perl php-ldap php-mysql mysql-server mysql MySQL-python php-mbstring php-gd php-soap perl-DateManip sysstat gd-devel freetype-devel libpng-devel libjpeg-devel dump dejavu-lgc-fonts compat-libstdc++-33 policycoreutils selinux-policy selinux-policy-targeted zip unzip enscript xinetd mod_auth_mysql nscd"
-BUILDDEPS="libtool krb5-devel pam-devel byacc flex httpd-devel docbook-style-xsl doxygen gettext neon-devel openssl-devel sqlite-devel swig"
-MISSINGCVS="gcc"
-MISSINGHIL="gcc-c++"
-MISSINGMUNIN="which"
-#================
-# See http://wiki.centos.org/PackageManagement/Yum/Priorities
-#================
-ssh root@$HOST mkdir -p /usr/share/codendi/src
-ssh root@$HOST yum install -y rsync make rpm-build yum-priorities
-# Needed to build package, not working yet
-#rsync -rlptD $CDXVERS/rpm/ root@$HOST:/usr/src/redhat/
-#ssh root@$HOST yum install -y $BUILDDEPS $MISSINGCVS $MISSINGHIL $MISSINGMUNIN
-#ssh root@$HOST "cd /usr/src/redhat ; make"
-# Build codendi.tgz
-(cd $WORKSPACE/$CDXVERS ; tar cvzf $WORKSPACE/CDROM/Codendi/codendi.tgz cli codendi_tools documentation downloads plugins rpm site-content src)
-# Coping prebuilded
-rsync -rlptD $WORKSPACE/CDROM/ root@$HOST:/root/
-# Next is done in codendi.tgz
-#rsync -a $CDXVERS/src/ root@$HOST:/usr/share/codendi/src/
-
-scp $WORKSPACE/$CDXVERS/codendi_tools/codendi_install.sh root@$HOST:
-scp $WORKSPACE/$CDXVERS/codendi_tools/localconf root@$HOST:
-ssh root@$HOST chmod +x codendi_install.sh
-ssh root@$HOST yum install -y $CDXPACKAGES
-
-# Disable SELINUX
-ssh root@$HOST perl -pi -e 's/^SELINUX=.*/SELINUX=disabled/' /etc/selinux/config
-
-ssh root@$HOST /root/codendi_install.sh
-ssh root@$HOST /usr/share/codendi/src/utils/generate_ssl_certificate.sh <<-FIN
-y
-FR
-ISERE
-GRENOBLE
-MYCOMPANY
-
-$HOST
-admin@$HOST
-
-
-
-
-
-FIN
-#=== Mediawiki ===
-ssh root@$HOST yum --enablerepo=epel -y  install mediawiki115
-#=================
-retcode=0
-
-echo "Run phpunit test on $HOST"
-ssh -X root@$HOST "tests/scripts/phpunit.sh CDXCentos52Tests.php" || retcode=$?
-
-if [ "x$SELENIUM_RC_DIR" != "x" ]
-then
-        rsync -av root@$HOST:/var/log/ $SELENIUM_RC_DIR/
-fi
-cp $WORKSPACE/reports/phpunit-selenium.xml $WORKSPACE/reports/phpunit-selenium.xml.org
-xalan -in $WORKSPACE/reports/phpunit-selenium.xml.org -xsl fix_phpunit.xslt -out $WORKSPACE/reports/phpunit-selenium.xml
-#================
-
-if $KEEPVM
-then
-        echo "Keeping vm $HOST alive"
-else
-        (cd tests/scripts ; sh ./stop_vm.sh $HOST)
-fi
-exit $retcode

commit d382fd08e110eb51782b6033fda48ef94a6d3388
Author: Roland Mas <lolando at debian.org>
Date:   Mon Apr 28 14:22:33 2014 +0200

    SSH tests specific to Debian for now

diff --git a/tests/DEBDebian70Tests.php b/tests/DEBDebian70Tests.php
index 2f99b67..676db93 100644
--- a/tests/DEBDebian70Tests.php
+++ b/tests/DEBDebian70Tests.php
@@ -24,6 +24,7 @@ class DEBDebian70Tests
 		// Selenium tests
 		if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
 		$suite->addTestFiles(glob("func/Site/*Test.php"));
+		$suite->addTestFiles(glob("func/SSH/*Test.php"));
 		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
 		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
 		$suite->addTestFiles(glob("func/Docs/*Test.php"));
diff --git a/tests/DEBDebian70TestsSRC.php b/tests/DEBDebian70TestsSRC.php
index 270b9b9..a31ecbb 100644
--- a/tests/DEBDebian70TestsSRC.php
+++ b/tests/DEBDebian70TestsSRC.php
@@ -24,6 +24,7 @@ class DEBDebian60Tests
 		// Selenium tests
 		if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
 		$suite->addTestFiles(glob("func/Site/*Test.php"));
+//		$suite->addTestFiles(glob("func/SSH/*Test.php"));
 		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
 		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
 		$suite->addTestFiles(glob("func/Docs/*Test.php"));
diff --git a/tests/RPMCentosTests.php b/tests/RPMCentosTests.php
index e5baeae..4d4fa68 100644
--- a/tests/RPMCentosTests.php
+++ b/tests/RPMCentosTests.php
@@ -22,6 +22,7 @@ class RPMCentosTests
 
 		// Selenium tests
 		$suite->addTestFiles(glob("func/Site/*Test.php"));
+//		$suite->addTestFiles(glob("func/SSH/*Test.php"));
 		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
 		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
 		$suite->addTestFiles(glob("func/Docs/*Test.php"));
diff --git a/tests/TarCentosTests.php b/tests/TarCentosTests.php
index 298d119..c19a448 100644
--- a/tests/TarCentosTests.php
+++ b/tests/TarCentosTests.php
@@ -22,6 +22,7 @@ class TarCentosTests
 
 		// Selenium tests
 		$suite->addTestFiles(glob("func/Site/*Test.php"));
+//		$suite->addTestFiles(glob("func/SSH/*Test.php"));
 		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
 		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
 		$suite->addTestFiles(glob("func/Docs/*Test.php"));
diff --git a/tests/func/Site/sshTest.php b/tests/func/SSH/sshTest.php
similarity index 100%
rename from tests/func/Site/sshTest.php
rename to tests/func/SSH/sshTest.php

-----------------------------------------------------------------------

Summary of changes:
 tests/CDXCentos52Tests.php                   |   39 --------
 tests/DEBDebian70Tests.php                   |    1 +
 tests/DEBDebian70TestsSRC.php                |    1 +
 tests/RPMCentosTests.php                     |    1 +
 tests/SeleniumTests.php                      |   44 --------
 tests/TarCentosTests.php                     |    1 +
 tests/func/{Site => SSH}/sshTest.php         |    0
 tests/scripts/cdx40-build-and-test-source.sh |  139 --------------------------
 8 files changed, 4 insertions(+), 222 deletions(-)
 delete mode 100644 tests/CDXCentos52Tests.php
 delete mode 100644 tests/SeleniumTests.php
 rename tests/func/{Site => SSH}/sshTest.php (100%)
 delete mode 100755 tests/scripts/cdx40-build-and-test-source.sh


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list