fix tests

aptly-dev · Oct 22, 2024 · e99efca · e99efca
1 parent a40de35
commit e99efca
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 15 deletions.
diff --git a/system/t03_help/MirrorCreateHelpTest_gold b/system/t03_help/MirrorCreateHelpTest_gold
@@ -21,8 +21,8 @@ Options:
   -dep-follow-source: when processing dependencies, follow from binary to Source packages
   -dep-follow-suggests: when processing dependencies, follow Suggests
   -dep-verbose-resolve: when processing dependencies, print detailed logs
-  -deps-from-mirrors: list of mirrors thats packages's dependencies should be fulfilled (comma-separated), default to none
-  -deps-from-repos: list of repositories thats packages's dependencies should be fulfilled (comma-separated), default to none
+  -deps-from-mirrors="": list of mirrors thats packages's dependencies should be fulfilled (comma-separated), default to none
+  -deps-from-repos="": list of repositories thats packages's dependencies should be fulfilled (comma-separated), default to none
   -filter="": filter packages in mirror
   -filter-with-deps: when filtering, include dependencies of matching packages as well
   -force-architectures: (only with architecture list) skip check that requested architectures are listed in Release file

diff --git a/system/t03_help/MirrorCreateTest_gold b/system/t03_help/MirrorCreateTest_gold
@@ -12,8 +12,8 @@ Options:
   -dep-follow-source: when processing dependencies, follow from binary to Source packages
   -dep-follow-suggests: when processing dependencies, follow Suggests
   -dep-verbose-resolve: when processing dependencies, print detailed logs
-  -deps-from-mirrors: list of mirrors thats packages's dependencies should be fulfilled (comma-separated), default to none
-  -deps-from-repos: list of repositories thats packages's dependencies should be fulfilled (comma-separated), default to none
+  -deps-from-mirrors="": list of mirrors thats packages's dependencies should be fulfilled (comma-separated), default to none
+  -deps-from-repos="": list of repositories thats packages's dependencies should be fulfilled (comma-separated), default to none
   -filter="": filter packages in mirror
   -filter-with-deps: when filtering, include dependencies of matching packages as well
   -force-architectures: (only with architecture list) skip check that requested architectures are listed in Release file

diff --git a/system/t03_help/WrongFlagTest_gold b/system/t03_help/WrongFlagTest_gold
@@ -13,8 +13,8 @@ Options:
   -dep-follow-source: when processing dependencies, follow from binary to Source packages
   -dep-follow-suggests: when processing dependencies, follow Suggests
   -dep-verbose-resolve: when processing dependencies, print detailed logs
-  -deps-from-mirrors: list of mirrors thats packages's dependencies should be fulfilled (comma-separated), default to none
-  -deps-from-repos: list of repositories thats packages's dependencies should be fulfilled (comma-separated), default to none
+  -deps-from-mirrors="": list of mirrors thats packages's dependencies should be fulfilled (comma-separated), default to none
+  -deps-from-repos="": list of repositories thats packages's dependencies should be fulfilled (comma-separated), default to none
   -filter="": filter packages in mirror
   -filter-with-deps: when filtering, include dependencies of matching packages as well
   -force-architectures: (only with architecture list) skip check that requested architectures are listed in Release file

diff --git a/system/t04_mirror/ListMirror6Test_gold b/system/t04_mirror/ListMirror6Test_gold
@@ -42,7 +42,9 @@
     "SkipArchitectureCheck": false,
     "DownloadSources": false,
     "DownloadUdebs": false,
-    "DownloadInstaller": false
+    "DownloadInstaller": false,
+    "DepsFromMirrors": null,
+    "DepsFromRepos": null
   },
   {
     "Name": "mirror2",
@@ -85,7 +87,9 @@
     "SkipArchitectureCheck": false,
     "DownloadSources": true,
     "DownloadUdebs": false,
-    "DownloadInstaller": false
+    "DownloadInstaller": false,
+    "DepsFromMirrors": null,
+    "DepsFromRepos": null
   },
   {
     "Name": "mirror3",
@@ -119,7 +123,9 @@
     "SkipArchitectureCheck": false,
     "DownloadSources": false,
     "DownloadUdebs": false,
-    "DownloadInstaller": false
+    "DownloadInstaller": false,
+    "DepsFromMirrors": null,
+    "DepsFromRepos": null
   },
   {
     "Name": "mirror4",
@@ -145,6 +151,8 @@
     "SkipArchitectureCheck": false,
     "DownloadSources": false,
     "DownloadUdebs": false,
-    "DownloadInstaller": false
+    "DownloadInstaller": false,
+    "DepsFromMirrors": null,
+    "DepsFromRepos": null
   }
 ]
diff --git a/system/t04_mirror/ShowMirror5Test_gold b/system/t04_mirror/ShowMirror5Test_gold
@@ -41,5 +41,7 @@
   "SkipArchitectureCheck": false,
   "DownloadSources": false,
   "DownloadUdebs": false,
-  "DownloadInstaller": false
+  "DownloadInstaller": false,
+  "DepsFromMirrors": null,
+  "DepsFromRepos": null
 }
diff --git a/system/t04_mirror/ShowMirror7Test_gold b/system/t04_mirror/ShowMirror7Test_gold
@@ -357,5 +357,7 @@
     "xvba-va-driver_0.8.0-5_i386",
     "ydpdict_1.0.0-2_amd64",
     "ydpdict_1.0.0-2_i386"
-  ]
+  ],
+  "DepsFromMirrors": null,
+  "DepsFromRepos": null
 }
diff --git a/system/t04_mirror/ShowMirror8Test_gold b/system/t04_mirror/ShowMirror8Test_gold
@@ -33,5 +33,7 @@
   "SkipArchitectureCheck": false,
   "DownloadSources": false,
   "DownloadUdebs": false,
-  "DownloadInstaller": false
+  "DownloadInstaller": false,
+  "DepsFromMirrors": null,
+  "DepsFromRepos": null
 }
diff --git a/system/t05_snapshot/ShowSnapshot4Test_gold b/system/t05_snapshot/ShowSnapshot4Test_gold
@@ -34,7 +34,9 @@
       "SkipArchitectureCheck": false,
       "DownloadSources": false,
       "DownloadUdebs": false,
-      "DownloadInstaller": false
+      "DownloadInstaller": false,
+      "DepsFromMirrors": null,
+      "DepsFromRepos": null
     }
   ],
   "Description": "Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy",

diff --git a/system/t05_snapshot/ShowSnapshot5Test_gold b/system/t05_snapshot/ShowSnapshot5Test_gold
@@ -36,7 +36,9 @@
       "SkipArchitectureCheck": false,
       "DownloadSources": false,
       "DownloadUdebs": false,
-      "DownloadInstaller": false
+      "DownloadInstaller": false,
+      "DepsFromMirrors": null,
+      "DepsFromRepos": null
     }
   ],
   "Packages": [