New upstream version 1.3.0

system/t04_mirror/UpdateMirror22Test_gold

@@ -4,7 +4,7 @@ openpgp: Good signature from "NVIDIA CORPORATION (Open Source Projects) <cudatoo
 Downloading & parsing package files...
 Downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/Packages.xz...
 Applying filter...
-Packages filtered: 8 -> 0.
+Packages filtered: 20 -> 0.
 Building download queue...
 Download queue: 0 items (0 B)
 

system/t04_mirror/create.py

@@ -253,7 +253,8 @@ class CreateMirror20Test(BaseTest):
     expectedCode = 1
 
     def outputMatchPrepare(_, s):
-        return s.replace('getsockopt: ', '').replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137')
+        return s.replace('getsockopt: ', '').replace('connect: ', ''). \
+            replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137')
 
 
 class CreateMirror21Test(BaseTest):

system/t04_mirror/edit.py

@@ -107,5 +107,6 @@ class EditMirror10Test(BaseTest):
     """
     edit mirror: change archive url
     """
+    requiresFTP = True
     fixtureCmds = ["aptly mirror create -ignore-signatures mirror10 ftp://ftp.ru.debian.org/debian wheezy main"]
     runCmd = "aptly mirror edit -ignore-signatures -archive-url ftp://ftp.ch.debian.org/debian mirror10"

system/t04_mirror/update.py

@@ -155,6 +155,7 @@ class UpdateMirror11Test(BaseTest):
     """
     longTest = False
     fixtureGpg = True
+    requiresFTP = True
     fixtureCmds = [
         "aptly mirror create -keyring=aptlytest.gpg -filter='Priority (required), Name (% s*)' -architectures=i386 wheezy-main ftp://ftp.ru.debian.org/debian/ wheezy main",
     ]