Merge pull request #4126 from owncloud/parallel-autotest.sh-master
Parallel autotest.sh master
This commit is contained in:
Thomas Müller
commit
6ddad8dc49
|
|
@ -14,6 +14,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
|
|||
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
|
||||
require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
|
||||
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
|
||||
require_once realpath(dirname(__FILE__) . '/util.php');
|
||||
|
||||
use OCA\Encryption;
|
||||
|
||||
|
|
@ -22,6 +23,8 @@ use OCA\Encryption;
|
|||
*/
|
||||
class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
||||
|
||||
const TEST_USER = "test-keymanager-user";
|
||||
|
||||
public $userId;
|
||||
public $pass;
|
||||
public $stateFilesTrashbin;
|
||||
|
|
@ -47,17 +50,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
|||
// disable file proxy by default
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
// setup filesystem
|
||||
\OC_Util::tearDownFS();
|
||||
\OC_User::setUserId('');
|
||||
\OC\Files\Filesystem::tearDown();
|
||||
\OC_Util::setupFS('admin');
|
||||
\OC_User::setUserId('admin');
|
||||
|
||||
// login admin
|
||||
$params['uid'] = 'admin';
|
||||
$params['password'] = 'admin';
|
||||
OCA\Encryption\Hooks::login($params);
|
||||
// create test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Keymanager::TEST_USER);
|
||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Keymanager::TEST_USER, true);
|
||||
}
|
||||
|
||||
function setUp() {
|
||||
|
|
@ -75,9 +70,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
$this->view = new \OC_FilesystemView('/');
|
||||
|
||||
\OC_User::setUserId('admin');
|
||||
$this->userId = 'admin';
|
||||
$this->pass = 'admin';
|
||||
\OC_User::setUserId(\Test_Encryption_Keymanager::TEST_USER);
|
||||
$this->userId = \Test_Encryption_Keymanager::TEST_USER;
|
||||
$this->pass = \Test_Encryption_Keymanager::TEST_USER;
|
||||
|
||||
$userHome = \OC_User::getHome($this->userId);
|
||||
$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
|
||||
|
|
@ -101,6 +96,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
public static function tearDownAfterClass() {
|
||||
\OC_FileProxy::$enabled = true;
|
||||
|
||||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Keymanager::TEST_USER);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -226,9 +224,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
|||
$filename = '/tmp-' . time() . '.txt';
|
||||
|
||||
// create folder structure
|
||||
$this->view->mkdir('/admin/files/folder1');
|
||||
$this->view->mkdir('/admin/files/folder1/subfolder');
|
||||
$this->view->mkdir('/admin/files/folder1/subfolder/subsubfolder');
|
||||
$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
|
||||
$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder');
|
||||
$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder/subsubfolder');
|
||||
|
||||
// enable encryption proxy
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
|
|
|
|||
55
autotest.sh
55
autotest.sh
|
|
@ -3,12 +3,18 @@
|
|||
# ownCloud
|
||||
#
|
||||
# @author Thomas Müller
|
||||
# @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
|
||||
# @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
|
||||
#
|
||||
|
||||
#$EXECUTOR_NUMBER is set by Jenkins and allows us to run autotest in parallel
|
||||
DATABASENAME=oc_autotest$EXECUTOR_NUMBER
|
||||
DATABASEUSER=oc_autotest$EXECUTOR_NUMBER
|
||||
ADMINLOGIN=admin$EXECUTOR_NUMBER
|
||||
DATADIR=data-autotest
|
||||
BASEDIR=$PWD
|
||||
|
||||
echo "Using database $DATABASENAME"
|
||||
|
||||
# create autoconfig for sqlite, mysql and postgresql
|
||||
cat > ./tests/autoconfig-sqlite.php <<DELIM
|
||||
<?php
|
||||
|
|
@ -16,7 +22,7 @@ cat > ./tests/autoconfig-sqlite.php <<DELIM
|
|||
'installed' => false,
|
||||
'dbtype' => 'sqlite',
|
||||
'dbtableprefix' => 'oc_',
|
||||
'adminlogin' => 'admin',
|
||||
'adminlogin' => '$ADMINLOGIN',
|
||||
'adminpass' => 'admin',
|
||||
'directory' => '$BASEDIR/$DATADIR',
|
||||
);
|
||||
|
|
@ -28,13 +34,13 @@ cat > ./tests/autoconfig-mysql.php <<DELIM
|
|||
'installed' => false,
|
||||
'dbtype' => 'mysql',
|
||||
'dbtableprefix' => 'oc_',
|
||||
'adminlogin' => 'admin',
|
||||
'adminlogin' => '$ADMINLOGIN',
|
||||
'adminpass' => 'admin',
|
||||
'directory' => '$BASEDIR/$DATADIR',
|
||||
'dbuser' => 'oc_autotest',
|
||||
'dbname' => 'oc_autotest',
|
||||
'dbuser' => '$DATABASEUSER',
|
||||
'dbname' => '$DATABASENAME',
|
||||
'dbhost' => 'localhost',
|
||||
'dbpass' => 'owncloud',
|
||||
'dbpass' => 'owncloud',
|
||||
);
|
||||
DELIM
|
||||
|
||||
|
|
@ -44,13 +50,13 @@ cat > ./tests/autoconfig-pgsql.php <<DELIM
|
|||
'installed' => false,
|
||||
'dbtype' => 'pgsql',
|
||||
'dbtableprefix' => 'oc_',
|
||||
'adminlogin' => 'admin',
|
||||
'adminlogin' => '$ADMINLOGIN',
|
||||
'adminpass' => 'admin',
|
||||
'directory' => '$BASEDIR/$DATADIR',
|
||||
'dbuser' => 'oc_autotest',
|
||||
'dbname' => 'oc_autotest',
|
||||
'dbuser' => '$DATABASEUSER',
|
||||
'dbname' => '$DATABASENAME',
|
||||
'dbhost' => 'localhost',
|
||||
'dbpass' => 'owncloud',
|
||||
'dbpass' => 'owncloud',
|
||||
);
|
||||
DELIM
|
||||
|
||||
|
|
@ -60,10 +66,10 @@ cat > ./tests/autoconfig-oci.php <<DELIM
|
|||
'installed' => false,
|
||||
'dbtype' => 'oci',
|
||||
'dbtableprefix' => 'oc_',
|
||||
'adminlogin' => 'admin',
|
||||
'adminlogin' => '$ADMINLOGIN',
|
||||
'adminpass' => 'admin',
|
||||
'directory' => '$BASEDIR/$DATADIR',
|
||||
'dbuser' => 'oc_autotest',
|
||||
'dbuser' => '$DATABASENAME',
|
||||
'dbname' => 'XE',
|
||||
'dbhost' => 'localhost',
|
||||
'dbpass' => 'owncloud',
|
||||
|
|
@ -88,21 +94,21 @@ function execute_tests {
|
|||
|
||||
# drop database
|
||||
if [ "$1" == "mysql" ] ; then
|
||||
mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
|
||||
mysql -u $DATABASEUSER -powncloud -e "DROP DATABASE $DATABASENAME"
|
||||
fi
|
||||
if [ "$1" == "pgsql" ] ; then
|
||||
dropdb -U oc_autotest oc_autotest
|
||||
dropdb -U $DATABASEUSER $DATABASENAME
|
||||
fi
|
||||
if [ "$1" == "oci" ] ; then
|
||||
echo "drop the database"
|
||||
sqlplus -s -l / as sysdba <<EOF
|
||||
drop user oc_autotest cascade;
|
||||
drop user $DATABASENAME cascade;
|
||||
EOF
|
||||
|
||||
echo "create the database"
|
||||
sqlplus -s -l / as sysdba <<EOF
|
||||
create user oc_autotest identified by owncloud;
|
||||
alter user oc_autotest default tablespace users
|
||||
create user $DATABASENAME identified by owncloud;
|
||||
alter user $DATABASENAME default tablespace users
|
||||
temporary tablespace temp
|
||||
quota unlimited on users;
|
||||
grant create session
|
||||
|
|
@ -113,7 +119,7 @@ EOF
|
|||
, create view
|
||||
, create synonym
|
||||
, alter session
|
||||
to oc_autotest;
|
||||
to $DATABASENAME;
|
||||
exit;
|
||||
EOF
|
||||
fi
|
||||
|
|
@ -153,15 +159,24 @@ fi
|
|||
|
||||
#
|
||||
# NOTES on mysql:
|
||||
# - CREATE DATABASE oc_autotest;
|
||||
# - CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud';
|
||||
# - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
|
||||
# - grant all on oc_autotest.* to 'oc_autotest'@'localhost';
|
||||
#
|
||||
# - for parallel executor support with EXECUTOR_NUMBER=0:
|
||||
# - CREATE DATABASE oc_autotest0;
|
||||
# - CREATE USER 'oc_autotest0'@'localhost' IDENTIFIED BY 'owncloud';
|
||||
# - grant all on oc_autotest0.* to 'oc_autotest0'@'localhost';
|
||||
#
|
||||
# NOTES on pgsql:
|
||||
# - su - postgres
|
||||
# - createuser -P (enter username and password and enable superuser)
|
||||
# - createuser -P oc_autotest (enter password and enable superuser)
|
||||
# - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
|
||||
# local all all trust
|
||||
#
|
||||
# - for parallel executor support with EXECUTOR_NUMBER=0:
|
||||
# - createuser -P oc_autotest0 (enter password and enable superuser)
|
||||
#
|
||||
# NOTES on oci:
|
||||
# - it's a pure nightmare to install Oracle on a Linux-System
|
||||
# - DON'T TRY THIS AT HOME!
|
||||
|
|
|
|||
Loading…
Reference in New Issue