Package: python-boto
Version: 2.29.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Maintainer,

When merging Ubuntu's python-boto delta from Debian, we have 2 changes
that we're carrying, both represented in the attached diff.

a.) run tests/test.py with each python in 'pyversions -i'
   This seemed simply typo/oversite.  debian/tests/unit was doing:
     for python in $(pyversions -i)
       tests/test.py unit > /dev/null; done
   It didn't seem like there was any way that the expected python
   would be used there.  Instead, I changed it to run:
       $python tests/test.py unit

b.) Corey Bryant made a change to debian/tests/test.py described as
"d/tests/unit: Fix autopkgtest error in test_timeout." .
Unfortunately I don't have more information on this.

Scott

In Ubuntu, the attached patch was applied to achieve the following:

  * Merge with debian. Remaining Ubuntu changes:
    * d/tests/unit: Fix autopkgtest error in test_timeout.
    * d/tests/unit: run tests/test.py with each python in 'pyversions -i'


Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-5-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/tests/unit'
--- debian/tests/unit	2014-03-30 12:36:49 +0000
+++ debian/tests/unit	2014-07-28 19:20:40 +0000
@@ -1,9 +1,23 @@
 #/bin/sh
 
+set -ex
+
+#Create temporary home directory with .ssh/known_hosts file
+#so that test_timeout will be able to work.
+home_orig=$HOME
+home_temp=$(mktemp -d)
+mkdir -p "$home_temp/.ssh"
+touch "$home_temp/.ssh/known_hosts"
+export HOME=$home_temp
+
 set -eu
 cp -r tests "$ADTTMP/"
 cd "$ADTTMP"
 
 for python in $(pyversions -i); do
-    tests/test.py unit > /dev/null
+    $python tests/test.py unit > /dev/null
 done
+
+#Restore original home directory and remove temp home dir
+export HOME=$home_orig
+rm -rf $home_temp

Reply via email to