- try downloading clearsigned InRelease before trying Release.gpg

[apt.git] / test / integration / test-bug-595691-empty-and-broken-archive-files

diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 66792899a834e4c1b3ee5aa5ade5efbfd985dd4f..c5379dca030cb216c728c6f189508b596f768876 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -74,28 +74,24 @@ testoverfile() {
        setupcompressor "$1"
 
        createemptyfile 'en'
        setupcompressor "$1"
 
        createemptyfile 'en'

-       testaptgetupdate "Get:1 file:  Release.gpg []
-Get:2 file:  Release []
+       testaptgetupdate "Get:1 file:  InRelease []

 Ign file:$(readlink -f aptarchive)/  Translation-en
 Reading package lists..." "empty file en.$COMPRESS over file"
 
        createemptyarchive 'en'
 Ign file:$(readlink -f aptarchive)/  Translation-en
 Reading package lists..." "empty file en.$COMPRESS over file"
 
        createemptyarchive 'en'

-       testaptgetupdate "Get:1 file:  Release.gpg []
-Get:2 file:  Release []
+       testaptgetupdate "Get:1 file:  InRelease []

 Reading package lists..." "empty archive en.$COMPRESS over file"
 
        createemptyarchive 'Packages'
        # FIXME: Why omits the file transport the Packages Get line?
        #Get:3 file:  Packages []
        testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en
 Reading package lists..." "empty archive en.$COMPRESS over file"
 
        createemptyarchive 'Packages'
        # FIXME: Why omits the file transport the Packages Get line?
        #Get:3 file:  Packages []
        testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en

-Get:1 file:  Release.gpg []
-Get:2 file:  Release []
+Get:1 file:  InRelease []

 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'
        testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'
        testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en

-Get:1 file:  Release.gpg []
-Get:2 file:  Release []
+Get:1 file:  InRelease []

 Err file:  Packages
   Undetermined Error
 W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS)  Undetermined Error
 Err file:  Packages
   Undetermined Error
 W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS)  Undetermined Error


@@ -107,33 +103,29 @@ testoverhttp() {
        setupcompressor "$1"
 
        createemptyfile 'en'
        setupcompressor "$1"
 
        createemptyfile 'en'

-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
+       testaptgetupdate "Get:1 http://localhost  InRelease []

 Get:2 http://localhost/  Translation-en
 Get:2 http://localhost/  Translation-en

-Get:3 http://localhost  Release []
+Get:3 http://localhost  Packages []

 Ign http://localhost/  Translation-en
 Ign http://localhost/  Translation-en

-Get:4 http://localhost  Packages []

 Reading package lists..." "empty file en.$COMPRESS over http"
 
        createemptyarchive 'en'
 Reading package lists..." "empty file en.$COMPRESS over http"
 
        createemptyarchive 'en'

-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
+       testaptgetupdate "Get:1 http://localhost  InRelease []

 Get:2 http://localhost/  Translation-en []
 Get:2 http://localhost/  Translation-en []

-Get:3 http://localhost  Release []
-Get:4 http://localhost  Packages []
+Get:3 http://localhost  Packages []

 Reading package lists..." "empty archive en.$COMPRESS over http"
 
        createemptyarchive 'Packages'
 Reading package lists..." "empty archive en.$COMPRESS over http"
 
        createemptyarchive 'Packages'

-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
+       testaptgetupdate "Get:1 http://localhost  InRelease []

 Ign http://localhost/  Translation-en
 Ign http://localhost/  Translation-en

-Get:2 http://localhost  Release []
-Get:3 http://localhost  Packages []
+Get:2 http://localhost  Packages []

 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
        createemptyfile 'Packages'
        #FIXME: we should response with a good error message instead
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
        createemptyfile 'Packages'
        #FIXME: we should response with a good error message instead

-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
+       testaptgetupdate "Get:1 http://localhost  InRelease []

 Ign http://localhost/  Translation-en
 Ign http://localhost/  Translation-en

-Get:2 http://localhost  Release []
-Get:3 http://localhost  Packages
+Get:2 http://localhost  Packages

 Err http://localhost  Packages
   Undetermined Error
 W: Failed to fetch http://localhost:8080/Packages.$COMPRESS  Undetermined Error
 Err http://localhost  Packages
   Undetermined Error
 W: Failed to fetch http://localhost:8080/Packages.$COMPRESS  Undetermined Error