[devscripts] 11/14: Fix various (potential) test failures.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit b8eae5b8c457786179672cebdec7d8c6551844c6
Author: James McCoy <jamessan at debian.org>
Date:   Tue Nov 19 22:35:19 2013 -0500

    Fix various (potential) test failures.
    
    Some devscripts commands can be configured by a config file.  If that is
    present in the test environment, it could cause a false negative test
    failure, as I noticed with the new uscan test.  Use --no-conf to ignore
    the config files.
    
    The online uscan test was also failing due to a change in the format of
    the version numbers used by the upstream authors, which is fixed by
    broadening the allowable version characters.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog       |    3 +++
 test/test_debchange    |    4 ++--
 test/test_debdiff      |    4 ++--
 test/test_licensecheck |    4 ++--
 test/test_uscan        |    2 +-
 test/test_uscan_online |    4 ++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2c1faa..90eec65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ devscripts (2.13.5) UNRELEASED; urgency=low
     automatically repack upstream archives which contain non-DFSG content.
     Thanks to Andreas Tille, gregor herrmann, and Rafael Laboissiere for the
     patches.  (Closes: #685787)
+  * test/*:
+    + Pass --no-conf to commands which may be influenced by ~/.devscripts
+    + Fix a test failure in test_uscan_online due to different version format.
 
   [ Evgeni Golov ]
   * debcheckout: allow setting the user for auth mode in the config.  (Closes:
diff --git a/test/test_debchange b/test/test_debchange
index d7d7095..041c0ae 100755
--- a/test/test_debchange
+++ b/test/test_debchange
@@ -15,10 +15,10 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 if test "$1" = --installed; then
-    COMMAND=dch
+    COMMAND="dch --no-conf"
     shift
 else
-    COMMAND="perl -I ${0%/*}/.. ${0%/*}/../scripts/debchange.pl"
+    COMMAND="perl -I ${0%/*}/.. ${0%/*}/../scripts/debchange.pl --no-conf"
 fi
 
 . "${0%/*}/shunit2-helper-functions.sh"
diff --git a/test/test_debdiff b/test/test_debdiff
index 926d218..2fb0cfe 100755
--- a/test/test_debdiff
+++ b/test/test_debdiff
@@ -16,10 +16,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 if test "$1" = --installed; then
-    COMMAND=debdiff
+    COMMAND="debdiff --no-conf"
     shift
 else
-    COMMAND="perl -I ${0%/*}/.. ${0%/*}/../scripts/debdiff.pl"
+    COMMAND="perl -I ${0%/*}/.. ${0%/*}/../scripts/debdiff.pl --no-conf"
 fi
 
 WORKDIR="$(readlink -f "${0%/*}")"
diff --git a/test/test_licensecheck b/test/test_licensecheck
index f057467..ac22e84 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -15,10 +15,10 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 if test "$1" = --installed; then
-    COMMAND=licensecheck
+    COMMAND="licensecheck --no-conf"
     shift
 else
-    COMMAND="../scripts/licensecheck.pl"
+    COMMAND="../scripts/licensecheck.pl --no-conf"
 fi
 
 WORKDIR="$(readlink -f "${0%/*}")"
diff --git a/test/test_uscan b/test/test_uscan
index fd213bc..e836f37 100755
--- a/test/test_uscan
+++ b/test/test_uscan
@@ -15,7 +15,7 @@
 # On Debian systems, the complete text of the GNU General Public License
 # version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
 
-COMMAND="$(pwd)/../scripts/uscan.pl"
+COMMAND="$(pwd)/../scripts/uscan.pl --no-conf"
 
 cleanup(){
     kill -9 $(cat $TMPDIR/repo/pid)
diff --git a/test/test_uscan_online b/test/test_uscan_online
index 47da566..18732e1 100755
--- a/test/test_uscan_online
+++ b/test/test_uscan_online
@@ -14,7 +14,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-COMMAND="${0%/*}/../scripts/uscan.pl"
+COMMAND="${0%/*}/../scripts/uscan.pl --no-conf"
 
 . "${0%/*}/shunit2-helper-functions.sh"
 
@@ -25,7 +25,7 @@ found() {
 testS3Bucket() {
     local latest=$(curl -s http://s3.amazonaws.com/rds-downloads | \
                    sed 's@\(</[A-Za-z]*>\)@\1\n at g' | grep '<Key>RDSCli-' | \
-                   sed 's at .*<Key>RDSCli-\([0-9.]*\)\.zip</Key>.*@\1 at g' | \
+                   sed 's at .*<Key>RDSCli-\([-0-9.]*\)\.zip</Key>.*@\1 at g' | \
                    sort -n | tail -n 1)
     local result="Processing watchfile line for package rdscli...
 Newest version on remote site is ${latest}, local version is 1.4.007

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git