Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Revert "init: Add manufacturer to pkgdesc when creating new device (#913)" (#1083)

Browse source 
This reverts commit 99d7b58ee5.

People usually add manufacturer name in the phone full name which
results in having manufacturer written double in pkdesc (e.g. `Samsung
Samsung Galaxy Mini 2`)
This commit is contained in:
Piotr Halama 2018-01-05 03:44:44 +01:00 • committed by Oliver Smith
parent 2619effe93
commit 2c5cd5d8bb
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/test_aportgen_device_wizard.py
View file

@ -112,16 +112,16 @@ def test_aportgen_device_wizard(args, monkeypatch):
# First run
deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
assert apkbuild["pkgname"] == "device-testsuite-testdevice"
assert apkbuild["pkgdesc"] == "Testsuite Testsuite Testdevice"
assert apkbuild["pkgdesc"] == "Testsuite Testdevice"
assert apkbuild["depends"] == ["linux-testsuite-testdevice"]
assert apkbuild_linux["pkgname"] == "linux-testsuite-testdevice"
assert apkbuild_linux["pkgdesc"] == "Testsuite Testsuite Testdevice kernel fork"
assert apkbuild_linux["pkgdesc"] == "Testsuite Testdevice kernel fork"
assert apkbuild_linux["arch"] == ["armhf"]
assert apkbuild_linux["_flavor"] == "testsuite-testdevice"
assert deviceinfo["name"] == "Testsuite Testdevice"
assert deviceinfo["manufacturer"] == "Testsuite"
assert deviceinfo["manufacturer"] == answers["Manufacturer"]
assert deviceinfo["arch"] == "armhf"
assert deviceinfo["keyboard"] == "false"
assert deviceinfo["external_disk"] == "true"