[Python-modules-commits] r29074 - in packages/ipython/trunk/debian (4 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Sunday, May 25, 2014 @ 18:07:16
  Author: jtaylor-guest
Revision: 29074

update autopkgtests and skip test_exit_code_signal, failure not debuggable

Modified:
  packages/ipython/trunk/debian/rules
  packages/ipython/trunk/debian/tests/python2
  packages/ipython/trunk/debian/tests/python3
  packages/ipython/trunk/debian/tests/tools

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2014-05-25 18:07:13 UTC (rev 29073)
+++ packages/ipython/trunk/debian/rules	2014-05-25 18:07:16 UTC (rev 29074)
@@ -38,12 +38,11 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
     	# test_not_writable_ipdir, fails as root
 	# test_console_starts, leaks python process
-	# test_constructor, test_notebook_help, as-installed only (static-path change)
+	# test_exit_code_signal sometimes fails with git-buildpackage but not when run manually
 	cd build && LC_ALL=C.UTF-8 HOME=$(CURDIR)/build \
 	PATH=$(CURDIR)/debian/tmp/usr/bin/:$(PATH) PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages \
 	xvfb-run -a -s "-screen 0 1280x1024x24 -noreset" \
-	iptest2 -- -e test_not_writable_ipdir -e test_console_starts \
-		-e test_constructor -e test_notebook_help;
+	iptest2 -- -e test_not_writable_ipdir -e test_console_starts -e test_exit_code_signal;
 else
 	:
 endif

Modified: packages/ipython/trunk/debian/tests/python2
===================================================================
--- packages/ipython/trunk/debian/tests/python2	2014-05-25 18:07:13 UTC (rev 29073)
+++ packages/ipython/trunk/debian/tests/python2	2014-05-25 18:07:16 UTC (rev 29074)
@@ -8,12 +8,9 @@
   mkdir -p $dest/$(dirname $f)
   cp -a $f $dest/$(dirname $f)
 done
-mkdir -p $dest/IPython/scripts/
-cp IPython/scripts/iptest $dest/IPython/scripts/
 cd $dest
 
 export TMPDIR=$ADTTMP
-dpkg -l | tee ${ADT_ARTIFACTS:-.}/$(basename $0)-packages.txt
 
 #disabled, just fills disk with junk even before its used by ipython
 #service mongodb start 2>&1 || true
@@ -28,10 +25,13 @@
       [ -f $f ] && [ ! -e $lf ] && ln -s $f $lf
     done
   done
+  export PYTHONPATH=$PWD
+  mkdir -p test-$py
+  cd test-$py
   LC_ALL=C.UTF-8 HOME=$PWD \
-  PATH=$PWD/IPython/scripts/:$PATH PYTHONPATH=$PWD \
   xvfb-run -a -s "-screen 0 1280x1024x24 -noreset" \
-  $py $PWD/IPython/scripts/iptest -v -e test_not_writable_ipdir -e test_console_starts;
+  $py -c "from IPython.testing.iptestcontroller import main; main()" -- -v -e test_not_writable_ipdir -e test_console_starts -e test_exit_code_signal;
+  cd -
 done
 
 #service mongodb stop 2>&1 || true

Modified: packages/ipython/trunk/debian/tests/python3
===================================================================
--- packages/ipython/trunk/debian/tests/python3	2014-05-25 18:07:13 UTC (rev 29073)
+++ packages/ipython/trunk/debian/tests/python3	2014-05-25 18:07:16 UTC (rev 29074)
@@ -2,21 +2,15 @@
 set -efu
 
 pys=$(py3versions -r)
-TWOTOTHREE=2to3-$(py3versions -dv)
 
 dest=$ADTTMP
 for f in $(find IPython -name tests -type d); do
   mkdir -p $dest/$(dirname $f)
   cp -a $f $dest/$(dirname $f)
-  $TWOTOTHREE -w --no-diffs $dest/$f 2>&1
 done
-mkdir -p $dest/IPython/scripts/
-cp IPython/scripts/iptest $dest/IPython/scripts/
-$TWOTOTHREE -w --no-diffs $dest/IPython/scripts/iptest 2>&1
 cd $dest
 
 export TMPDIR=$ADTTMP
-dpkg -l | tee ${ADT_ARTIFACTS:-.}/$(basename $0)-packages.txt
 
 #disabled, just fills disk with junk even before its used by ipython
 #service mongodb start 2>&1 || true
@@ -32,10 +26,13 @@
   done
 
 for py in $pys; do
+  export PYTHONPATH=$PWD
+  mkdir -p test-$py
+  cd test-$py
   LC_ALL=C.UTF-8 HOME=$PWD \
-  PATH=$PWD/IPython/scripts/:$PATH PYTHONPATH=$PWD \
   xvfb-run -a -s "-screen 0 1280x1024x24 -noreset" \
-  $py $PWD/IPython/scripts/iptest -v -e test_not_writable_ipdir -e test_console_starts;
+  $py -c "from IPython.testing.iptestcontroller import main; main()" -- -v -e test_not_writable_ipdir -e test_console_starts -e test_exit_code_signal;
+  cd -
 done
 
 #service mongodb stop 2>&1 || true

Modified: packages/ipython/trunk/debian/tests/tools
===================================================================
--- packages/ipython/trunk/debian/tests/tools	2014-05-25 18:07:13 UTC (rev 29073)
+++ packages/ipython/trunk/debian/tests/tools	2014-05-25 18:07:16 UTC (rev 29074)
@@ -6,11 +6,9 @@
 
 if [ "$1" = "ipython" ]; then
 IPYTHON=ipython
-IRUNNER=irunner
 IPCLUSTER=ipcluster
 elif [ "$1" = "ipython3" ]; then
 IPYTHON=ipython3
-IRUNNER=irunner3
 IPCLUSTER=ipcluster3
 fi
 
@@ -27,7 +25,6 @@
 tree.find('/')
 EOF
 
-$IRUNNER test.py
-$IRUNNER --ipython test.py
+$IPYTHON test.py
 
 $IPCLUSTER --help