ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-20 06:07:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1423 from balena-io/refactor-extra-uenv-match

Browse Source 
Refactor extra_uEnv backend to match with more devices
This commit is contained in:
bulldozer-balena[bot] 2020-09-15 19:11:41 +00:00 committed by GitHub
commit 69af7f4f10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/backends/extra-uEnv.ts
View File

@ -60,7 +60,10 @@ export class ExtraUEnv extends ConfigBackend {
public async matches(deviceType: string): Promise<boolean> {
return (
(deviceType === 'intel-nuc' || deviceType.startsWith('jetson')) &&
(deviceType === 'intel-nuc' ||
deviceType.endsWith('-nano') ||
deviceType.endsWith('-nano-emmc') ||
deviceType.endsWith('-tx2')) &&
(await fs.exists(ExtraUEnv.bootConfigPath))
);
}

109
test/32-extra-uenv-config.spec.ts
View File

@ -68,9 +68,19 @@ describe('extra_uEnv Configuration', () => {
it('only matches supported devices', async () => {
const existsStub = stub(fs, 'exists');
for (const { hasConfigFile, deviceType, supported } of MATCH_TESTS) {
existsStub.resolves(hasConfigFile);
await expect(backend.matches(deviceType)).to.eventually.equal(supported);
for (const device of MATCH_TESTS) {
// Test device that has extra_uEnv.txt
let hasExtraUEnv = true;
existsStub.resolves(hasExtraUEnv);
await expect(backend.matches(device.type)).to.eventually.equal(
device.supported && hasExtraUEnv,
);
// Test same device but without extra_uEnv.txt
hasExtraUEnv = false;
existsStub.resolves(hasExtraUEnv);
await expect(backend.matches(device.type)).to.eventually.equal(
device.supported && hasExtraUEnv,
);
}
existsStub.restore();
});
@ -239,79 +249,22 @@ const MALFORMED_CONFIGS = [
];
const MATCH_TESTS = [
{
deviceType: 'jetson-tx1',
hasConfigFile: true,
supported: true,
},
{
deviceType: 'jetson-tx2',
hasConfigFile: true,
supported: true,
},
{
deviceType: 'jetson-tx2',
hasConfigFile: false,
supported: false,
},
{
deviceType: 'jetson-nano',
hasConfigFile: true,
supported: true,
},
{
deviceType: 'jetson-nano',
hasConfigFile: false,
supported: false,
},
{
deviceType: 'jetson-xavier',
hasConfigFile: true,
supported: true,
},
{
deviceType: 'jetson-xavier',
hasConfigFile: false,
supported: false,
},
{
deviceType: 'intel-nuc',
hasConfigFile: true,
supported: true,
},
{
deviceType: 'intel-nuc',
hasConfigFile: false,
supported: false,
},
{
deviceType: 'raspberry',
hasConfigFile: true,
supported: false,
},
{
deviceType: 'raspberry',
hasConfigFile: false,
supported: false,
},
{
deviceType: 'fincm3',
hasConfigFile: true,
supported: false,
},
{
deviceType: 'fincm3',
hasConfigFile: false,
supported: false,
},
{
deviceType: 'up-board',
hasConfigFile: true,
supported: false,
},
{
deviceType: 'up-board',
hasConfigFile: false,
supported: false,
},
{ type: 'astro-tx2', supported: true },
{ type: 'blackboard-tx2', supported: true },
{ type: 'jetson-tx2', supported: true },
{ type: 'n310-tx2', supported: true },
{ type: 'n510-tx2', supported: true },
{ type: 'orbitty-tx2', supported: true },
{ type: 'spacely-tx2', supported: true },
{ type: 'srd3-tx2', supported: true },
{ type: 'jetson-nano', supported: true },
{ type: 'jetson-nano-emmc', supported: true },
{ type: 'jn30b-nano', supported: true },
{ type: 'photon-nano', supported: true },
{ type: 'intel-nuc', supported: true },
{ type: 'raspberry', supported: false },
{ type: 'fincm3', supported: false },
{ type: 'asus-tinker-board', supported: false },
{ type: 'nano-board', supported: false },
{ type: 'tx2-tx2-device', supported: false },
];