Merge branch 'test_for_1370' into 'master'

Add test for !1370

See merge request fdroid/fdroidserver!1372

.gitlab-ci.yml

@@ -41,7 +41,7 @@ metadata_v0:
   image: registry.gitlab.com/fdroid/fdroidserver:buildserver
   variables:
     GIT_DEPTH: 1000
-    RELEASE_COMMIT_ID: b0c05842d8c081cf5503b31e8ecc797dc95ed900  # 2.3a0
+    RELEASE_COMMIT_ID: a1c4f803de8d4dc92ebd6b571a493183d14a00bf  # after ArchivePolicy: 0
   script:
     - git fetch https://gitlab.com/fdroid/fdroidserver.git $RELEASE_COMMIT_ID
     - cd tests

tests/metadata/com.politedroid.yml

@@ -39,6 +39,10 @@ Builds:
     sudo: echo 'this is just a test'
     gradle:
       - yes
+    antifeatures:
+      - KnownVuln
+      - UpstreamNonFree
+      - NonFreeAssets
 
 ArchivePolicy: 4 versions
 AutoUpdateMode: Version v%v

tests/metadata/dump/com.politedroid.yaml

@@ -122,7 +122,10 @@ Builds:
   versionName: '1.4'
 - androidupdate: []
   antcommands: []
-  antifeatures: {}
+  antifeatures:
+    KnownVuln: {}
+    NonFreeAssets: {}
+    UpstreamNonFree: {}
   binary: null
   build: ''
   buildjni: []

tests/repo/entry.json

@@ -3,7 +3,7 @@
   "version": 20002,
   "index": {
     "name": "/index-v2.json",
-    "sha256": "f4979b9db840cb51a99e80c20da676ba42b13133dbaa4819673bc43ed2ffc3f3",
+    "sha256": "ba000a3f5e1935d338f374c50cae529b8ce6d988ab3ed67c7a8cf437502f81ad",
     "size": 52481,
     "numPackages": 10
   },

tests/repo/index-v1.json

@@ -231,6 +231,11 @@
     "com.politedroid": [
       {
         "added": 1498176000000,
+        "antiFeatures": [
+          "KnownVuln",
+          "NonFreeAssets",
+          "UpstreamNonFree"
+        ],
         "apkName": "com.politedroid_6.apk",
         "hash": "70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d",
         "hashType": "sha256",
@@ -689,4 +694,4 @@
       }
     ]
   }
-}
+}

tests/repo/index-v2.json

@@ -568,10 +568,13 @@
             ]
           },
           "antiFeatures": {
+            "KnownVuln": {},
             "NoSourceSince": {
               "en-US": "1.5"
             },
-            "NonFreeNet": {}
+            "NonFreeAssets": {},
+            "NonFreeNet": {},
+            "UpstreamNonFree": {}
           }
         },
         "5bdbfa071cca4b8d05ced41d6b28763595d6e8096cca5bbf0f9253c9a2622e5d": {
@@ -1403,4 +1406,4 @@
       }
     }
   }
-}
+}

tests/repo/index.xml

@@ -318,7 +318,7 @@ APK is called F-Droid Privileged Extension.</desc>
 		<tracker>https://github.com/miguelvps/PoliteDroid/issues</tracker>
 		<marketversion>1.5</marketversion>
 		<marketvercode>6</marketvercode>
-		<antifeatures>NoSourceSince,NonFreeNet</antifeatures>
+		<antifeatures>KnownVuln,NoSourceSince,NonFreeAssets,NonFreeNet,UpstreamNonFree</antifeatures>
 		<package>
 			<version>1.5</version>
 			<versioncode>6</versioncode>