From: Peter Rabbitson Date: Thu, 28 Nov 2013 08:52:28 +0000 (+0100) Subject: Add OracleXE 10.2-based testing X-Git-Tag: v0.08260~84 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=003e97c53e065e7497a4946c29d5a94e7cf34389;p=dbsrgits%2FDBIx-Class.git Add OracleXE 10.2-based testing --- diff --git a/.travis.yml b/.travis.yml index 2f7a767..eb3ec76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,13 @@ notifications: on_success: change on_failure: always +# FIXME - This stuff is not yet available for free OSS accounts, sadpanda +# First paragrah on http://about.travis-ci.org/docs/user/caching/ +#cache: +# apt: true +# directories: +# - /var/cache/apt/archives + language: perl perl: diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash index 8ab4701..1b57e6f 100755 --- a/maint/travis-ci_scripts/10_before_install.bash +++ b/maint/travis-ci_scripts/10_before_install.bash @@ -11,9 +11,13 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi # The oneliner is a tad convoluted - basicaly what we do is # slurp the entire file and get the index off the last # `processor : XX` line -export NUMTHREADS=$(( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 )) +export NUMTHREADS="$(( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 ))" + +export CACHE_DIR="/tmp/poormanscache" + +# install some common tools from APT, more below unless CLEANTEST +apt_install libapp-nopaste-perl tree apt-transport-https -run_or_err "Installing common tools from APT" "sudo apt-get install --allow-unauthenticated -y libapp-nopaste-perl tree" # FIXME - the debian package is oddly broken - uses a bin/env based shebang # so nothing works under a brew. Fix here until #debian-perl patches it up sudo /usr/bin/perl -p -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' $(which nopaste) @@ -25,8 +29,15 @@ if [[ "$CLEANTEST" != "true" ]]; then sudo bash -c 'echo -e "firebird2.5-super\tshared/firebird/enabled\tboolean\ttrue" | debconf-set-selections' sudo bash -c 'echo -e "firebird2.5-super\tshared/firebird/sysdba_password/new_password\tpassword\t123" | debconf-set-selections' - APT_PACKAGES="memcached firebird2.5-super firebird2.5-dev expect" - run_or_err "Installing packages ($APT_PACKAGES)" "sudo apt-get install --allow-unauthenticated -y $APT_PACKAGES" + # add extra APT repo for Oracle + # (https is critical - apt-get update can't seem to follow the 302) + sudo bash -c 'echo -e "\ndeb [arch=i386] https://oss.oracle.com/debian unstable main non-free" >> /etc/apt/sources.list' + + run_or_err "Cloning poor man's cache from github" "git clone --depth=1 --branch=poor_mans_travis_cache https://github.com/ribasushi/travis_futzing.git $CACHE_DIR && $CACHE_DIR/reassemble" + + run_or_err "Priming up the APT cache with $(echo $(ls -d $CACHE_DIR/apt_cache/*.deb))" "sudo cp $CACHE_DIR/apt_cache/*.deb /var/cache/apt/archives" + + apt_install memcached firebird2.5-super firebird2.5-dev expect oracle-xe ### config memcached run_or_err "Starting memcached" "sudo /etc/init.d/memcached start" @@ -51,8 +62,7 @@ if [[ "$CLEANTEST" != "true" ]]; then expect "Password for SYSDBA" send "123\r" sleep 1 - wait - sleep 1 + expect eof ' # creating testdb # FIXME - this step still fails from time to time >:((( @@ -90,13 +100,61 @@ if [[ "$CLEANTEST" != "true" ]]; then done -### oracle - # FIXME: todo - #DBICTEST_ORA_DSN=dbi:Oracle:host=localhost;sid=XE - #DBICTEST_ORA_USER=dbic_test - #DBICTEST_ORA_PASS=123 - #DBICTEST_ORA_EXTRAUSER_DSN=dbi:Oracle:host=localhost;sid=XE - #DBICTEST_ORA_EXTRAUSER_USER=dbic_test_extra - #DBICTEST_ORA_EXTRAUSER_PASS=123 - #ORACLE_HOME=/usr/lib/oracle/xe/app/oracle/product/10.2.0/client +### config oracle + EXPECT_ORA_SCRIPT=' + spawn /etc/init.d/oracle-xe configure + + sleep 1 + set send_slow {1 .005} + + expect "Specify the HTTP port that will be used for Oracle Application Express" + sleep 0.5 + send -s "8021\r" + + expect "Specify a port that will be used for the database listener" + sleep 0.5 + send -s "1521\r" + + expect "Specify a password to be used for database accounts" + sleep 0.5 + send -s "adminpass\r" + + expect "Confirm the password" + sleep 0.5 + send -s "adminpass\r" + + expect "Do you want Oracle Database 10g Express Edition to be started on boot" + sleep 0.5 + send -s "n\r" + + sleep 0.5 + expect "Configuring Database" + + sleep 1 + expect eof + wait + ' + + # if we do not redirect to some random file, but instead try to capture + # into a var the way run_or_err does - everything hangs + # FIXME: I couldn't figure it out after 3 hours of headdesking, + # would be nice to know the reason eventually + run_or_err "Configuring OracleXE" "sudo $(which expect) -c '$EXPECT_ORA_SCRIPT' &>/tmp/ora_configure_10.2.log" + SRV_ORA_HOME=/usr/lib/oracle/xe/app/oracle/product/10.2.0/server + + export DBICTEST_ORA_DSN=dbi:Oracle://localhost:1521/XE + export DBICTEST_ORA_USER=dbic_test + export DBICTEST_ORA_PASS=abc123456 + export DBICTEST_ORA_EXTRAUSER_DSN=dbi:Oracle://localhost:1521/XE + export DBICTEST_ORA_EXTRAUSER_USER=dbic_test_extra + export DBICTEST_ORA_EXTRAUSER_PASS=abc123456 + + run_or_err "Create Oracle users" "ORACLE_SID=XE ORACLE_HOME=$SRV_ORA_HOME $SRV_ORA_HOME/bin/sqlplus -L -S system/adminpass @/dev/stdin <<< ' + CREATE USER $DBICTEST_ORA_USER IDENTIFIED BY $DBICTEST_ORA_PASS; + GRANT connect,resource TO $DBICTEST_ORA_USER; + CREATE USER $DBICTEST_ORA_EXTRAUSER_USER IDENTIFIED BY $DBICTEST_ORA_EXTRAUSER_PASS; + GRANT connect,resource TO $DBICTEST_ORA_EXTRAUSER_USER; + '" + + export ORACLE_HOME="$CACHE_DIR/ora_instaclient/x86-64/oracle_instaclient_10.2.0.5.0" fi diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index ab1b84d..1572692 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -196,6 +196,9 @@ $(perl -0777 -p -e 's/.+\n\n(?!\z)//s' < /proc/cpuinfo) = Meminfo $(free -m -t) += Network Status +$(sudo netstat -an46p | grep -Pv '\s(CLOSING|(FIN|TIME|CLOSE)_WAIT.?|LAST_ACK)\s') + = Environment $(env | grep -P 'TEST|HARNESS|MAKE|TRAVIS|PERL|DBIC' | LC_ALL=C sort | cat -v) diff --git a/maint/travis-ci_scripts/common.bash b/maint/travis-ci_scripts/common.bash index 415ee69..99a2da4 100755 --- a/maint/travis-ci_scripts/common.bash +++ b/maint/travis-ci_scripts/common.bash @@ -18,6 +18,8 @@ run_or_err() { LASTEXIT=0 START_TIME=$SECONDS + # the tee is a handy debugging tool when stumpage is exceedingly strong + #LASTOUT=$( bash -c "$2" 2>&1 | tee /dev/stderr) || LASTEXIT=$? LASTOUT=$( bash -c "$2" 2>&1 ) || LASTEXIT=$? DELTA_TIME=$(( $SECONDS - $START_TIME )) @@ -34,6 +36,16 @@ run_or_err() { fi } +apt_install() { + # flatten + pkgs="$@" + + # Need to do this at every step, the sources list may very well have changed + run_or_err "Updating APT available package list" "sudo apt-get update" + + run_or_err "Installing Debian APT packages: $pkgs" "sudo apt-get install --allow-unauthenticated --no-install-recommends -y $pkgs" +} + extract_prereqs() { # once --verbose is set, --no-verbose can't disable it # do this by hand diff --git a/t/73oracle.t b/t/73oracle.t index fc324c5..19634af 100644 --- a/t/73oracle.t +++ b/t/73oracle.t @@ -488,7 +488,7 @@ sub _run_tests { # create identically named tables/sequences in the other schema do_creates($dbh2, $q); - # grand select privileges to the 2nd user + # grant select privileges to the 2nd user $dbh->do("GRANT INSERT ON ${q}artist${q} TO " . uc $user2); $dbh->do("GRANT SELECT ON ${q}artist${q} TO " . uc $user2); $dbh->do("GRANT SELECT ON ${q}artist_pk_seq${q} TO " . uc $user2);