Skip to content

Debloat any Android or Google TV over Wi-Fi and get an Apple TV-style home.

addons: verify Startup Branding image delivery

GaneshVarma1ec62891ce648
diff --git a/addons/startup-branding/push-image.sh b/addons/startup-branding/push-image.sh
index dce3400ae..b1a9d3980 100755
--- a/addons/startup-branding/push-image.sh
+++ b/addons/startup-branding/push-image.sh
@@ -38,7 +38,13 @@ for F in "$@"; do
SIZE=$(wc -c < "$F" | tr -d ' ')
[ "$SIZE" -le 15728640 ] || { echo "$NAME is over 15 MB" >&2; exit 1; }
"$PY" -I b64push.py "$F" "$TMP" >/dev/null || { echo "sending $NAME failed" >&2; exit 1; }
- tv "content write --uri $URI/$SAFE < $TMP; rm -f $TMP" >/dev/null
+ # tv.py does not pass through the TV shell's exit status. Android's content command can also
+ # print a provider error and exit 0, so require a silent write and successful staging cleanup.
+ OUT=$(tv "write_out=\$(content write --uri $URI/$SAFE < $TMP 2>&1); write_rc=\$?; if rm -f $TMP && [ \"\$write_rc\" -eq 0 ] && [ -z \"\$write_out\" ]; then echo __STARTUP_PICTURE_OK__; else printf '%s\n' \"\$write_out\"; fi")
+ case "$OUT" in
+ *__STARTUP_PICTURE_OK__*) ;;
+ *) echo "$OUT" >&2; echo "sending $SAFE failed" >&2; exit 1 ;;
+ esac
echo "sent $SAFE"
done
echo "Pick it on the TV: Startup & Branding, Custom Image, Picture."
diff --git a/tests/test_startup_branding_push_image.py b/tests/test_startup_branding_push_image.py
new file mode 100644
index 000000000..71a1f0ba5
--- /dev/null
+++ b/tests/test_startup_branding_push_image.py
@@ -0,0 +1,83 @@
+"""The image uploader must not say 'sent' when Android rejects the provider write."""
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+import unittest
+from pathlib import Path
+
+
+SCRIPT = Path(__file__).resolve().parents[1] / "addons/startup-branding/push-image.sh"
+
+
[email protected](os.name == "nt", "push-image.sh requires a POSIX shell")
+class PushImageTest(unittest.TestCase):
+ def setUp(self):
+ temp = tempfile.TemporaryDirectory()
+ self.addCleanup(temp.cleanup)
+ self.root = Path(temp.name)
+ addon = self.root / "addons/startup-branding"
+ addon.mkdir(parents=True)
+ tools = self.root / "tools"
+ (tools / "venv/bin").mkdir(parents=True)
+ (tools / "venv/bin/python").symlink_to(sys.executable)
+ self.stage = self.root / "staged-image"
+ script = SCRIPT.read_text().replace("TMP=/data/local/tmp/startup-branding-picture", f"TMP={self.stage}")
+ (addon / "push-image.sh").write_text(script)
+ (tools / "b64push.py").write_text("import shutil, sys\nshutil.copyfile(sys.argv[1], sys.argv[2])\n")
+ (tools / "tv.py").write_text('''\
+import os, subprocess, sys
+root = os.environ["FAKE_ROOT"]
+result = subprocess.run(["sh", "-c", sys.argv[1]], capture_output=True, text=True,
+ env={**os.environ, "PATH": root + "/bin:" + os.environ["PATH"]})
+sys.stdout.write(result.stdout)
+sys.stderr.write(result.stderr)
+''')
+ bin_dir = self.root / "bin"
+ bin_dir.mkdir()
+ for name, body in {
+ "pm": "#!/bin/sh\necho package:/fake/startup-branding.apk\n",
+ "content": '''#!/bin/sh
+case "$CONTENT_MODE" in
+ success) exit 0 ;;
+ error) echo 'Could not find provider' >&2; exit 0 ;;
+ nonzero) exit 1 ;;
+esac
+''',
+ }.items():
+ path = bin_dir / name
+ path.write_text(body)
+ path.chmod(0o755)
+ (self.root / "logo.png").write_bytes(b"test image")
+
+ def run_push(self, mode):
+ return subprocess.run(
+ ["bash", str(self.root / "addons/startup-branding/push-image.sh"), "logo.png"],
+ cwd=self.root,
+ env={**os.environ, "TV_HOST": "fake", "FAKE_ROOT": str(self.root), "CONTENT_MODE": mode},
+ capture_output=True, text=True,
+ )
+
+ def test_zero_exit_provider_error_is_not_reported_as_sent(self):
+ result = self.run_push("error")
+ self.assertNotEqual(result.returncode, 0)
+ self.assertIn("Could not find provider", result.stderr)
+ self.assertNotIn("sent logo.png", result.stdout)
+ self.assertFalse(self.stage.exists())
+
+ def test_nonzero_provider_error_is_not_reported_as_sent(self):
+ result = self.run_push("nonzero")
+ self.assertNotEqual(result.returncode, 0)
+ self.assertNotIn("sent logo.png", result.stdout)
+ self.assertFalse(self.stage.exists())
+
+ def test_silent_success_is_reported_as_sent(self):
+ result = self.run_push("success")
+ self.assertEqual(result.returncode, 0, result.stderr)
+ self.assertIn("sent logo.png", result.stdout)
+ self.assertFalse(self.stage.exists())
+
+
+if __name__ == "__main__":
+ unittest.main()