poldek: poldek/tests/sh/02-up-repo, poldek/tests/sh/lib/repo-setup...

mis mis at pld-linux.org
Sun Jun 24 13:31:19 CEST 2007


Author: mis                          Date: Sun Jun 24 11:31:19 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- vftest can deny files

---- Files affected:
poldek/poldek/tests/sh:
   02-up-repo (1.1 -> 1.2) 
poldek/poldek/tests/sh/lib:
   repo-setup (1.2 -> 1.3) , setup (1.2 -> 1.3) , vftest.sh (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: poldek/poldek/tests/sh/02-up-repo
diff -u poldek/poldek/tests/sh/02-up-repo:1.1 poldek/poldek/tests/sh/02-up-repo:1.2
--- poldek/poldek/tests/sh/02-up-repo:1.1	Sat Jun 23 21:07:19 2007
+++ poldek/poldek/tests/sh/02-up-repo	Sun Jun 24 13:31:14 2007
@@ -14,6 +14,8 @@
 
 testUpdate() 
 {
+    POLDEK_TESTING_DENIED_FILES="packages.ndir.diff.toc"
+
     rm -rf $REPO/*.rpm
     # Create repo and generate some diffs
     msg "\n## Creating empty index"
@@ -24,6 +26,7 @@
     msg "\n## up"
     up
 
+    POLDEK_TESTING_DENIED_FILES="packages.ndir.gz"
     msg "\n## Changing repo #1"    
     sleep 1
     add_package_to_repo
@@ -55,16 +58,29 @@
     msg "\n## up"
     up
 
-    # <glen att pld-linux.org> report: <https://bugs.pld-linux.org/show_bug.cgi?id=28>
-    msg "\n## Reset repo"
+    # <https://bugs.pld-linux.org/show_bug.cgi?id=28>
+    msg "\n## Resetting repo"
     sleep 1
     rm -rf $REPO/packages.*
     add_package_to_repo
     mkidx
     msg "\n## up"
-    up
 
-    
+    POLDEK_TESTING_DENIED_FILES="packages.ndir.diff.toc"
+    $POLDEK_UP -Oautoupa=yes -Osource="test,type=pndir $REPOURL" --up || fail "up failed"
+    POLDEK_TESTING_DENIED_FILES=""
+
+    # upa
+    msg "\n## Changing repo #4"
+    sleep 1
+    add_package_to_repo
+    mkidx
+    msg "\n## up"
+
+    POLDEK_TESTING_DENIED_FILES="packages.ndir.gz"
+    $POLDEK_UP -Oautoupa=n -Osource="test,type=pndir $REPOURL" --up || fail "up failed"
+
+    POLDEK_TESTING_DENIED_FILES=""
 }
 
 . ./sh/lib/shunit2

================================================================
Index: poldek/poldek/tests/sh/lib/repo-setup
diff -u poldek/poldek/tests/sh/lib/repo-setup:1.2 poldek/poldek/tests/sh/lib/repo-setup:1.3
--- poldek/poldek/tests/sh/lib/repo-setup:1.2	Sat Jun 23 21:07:19 2007
+++ poldek/poldek/tests/sh/lib/repo-setup	Sun Jun 24 13:31:14 2007
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 tearDown() {
+    POLDEK_TESTING_DENIED_FILES=""
     [ -n "$REPO" ] && rm -rf $REPO/packages.*
     [ -n "$TMPDIR" ] && rm -rf $TMPDIR/*.*
 }

================================================================
Index: poldek/poldek/tests/sh/lib/setup
diff -u poldek/poldek/tests/sh/lib/setup:1.2 poldek/poldek/tests/sh/lib/setup:1.3
--- poldek/poldek/tests/sh/lib/setup:1.2	Sat Jun 23 21:07:19 2007
+++ poldek/poldek/tests/sh/lib/setup	Sun Jun 24 13:31:14 2007
@@ -13,6 +13,10 @@
 POLDEK_TESTING=1 # prevent diff.toc vacuuming
 export POLDEK_TESTING
 
+# vtest.sh denies them to fetch
+POLDEK_TESTING_DENIED_FILES=
+export POLDEK_TESTING_DENIED_FILES
+
 MAXLOOP=60
 VERBOSE=""
 

================================================================
Index: poldek/poldek/tests/sh/lib/vftest.sh
diff -u poldek/poldek/tests/sh/lib/vftest.sh:1.2 poldek/poldek/tests/sh/lib/vftest.sh:1.3
--- poldek/poldek/tests/sh/lib/vftest.sh:1.2	Sat Jun 23 20:30:05 2007
+++ poldek/poldek/tests/sh/lib/vftest.sh	Sun Jun 24 13:31:14 2007
@@ -1,8 +1,8 @@
 #! /bin/sh
 # $Id$
 
-# support smb://[login[:passwd]@]host/service/[path/]file
-# requires: basename, grep, sed, smbclient
+# test://path schema
+# requires: sed, grep
 
 if [ "$#" != "2" ]; then
     echo "usage: `basename $0` test://path/FILE DESTFILE"
@@ -17,6 +17,14 @@
     echo "$src: no such file"
     exit 1
 fi
+
+POLDEK_TESTING_DENIED_FILES=${POLDEK_TESTING_DENIED_FILES:-""}
+for f in $POLDEK_TESTING_DENIED_FILES; do 
+    if echo $src | grep -qE "$f"; then
+       echo "DENIED FILE $f reqested"
+       exit 1 
+    fi
+done
 
 # Symlink packages, copy other files
 if echo $src | grep -qE '.rpm$'; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/tests/sh/02-up-repo?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/poldek/poldek/tests/sh/lib/repo-setup?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/poldek/poldek/tests/sh/lib/setup?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/poldek/poldek/tests/sh/lib/vftest.sh?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list