Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ut_urlresolver: work in sandbox
Actually, sandbox was not used up to now - it was instantiated but without
arguments and the enviroment was not prepared externally -> without effect.
  • Loading branch information
martyone committed Apr 4, 2013
1 parent 715aba3 commit 90b3a1e
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tests/ut_urlresolver/main.cpp
Expand Up @@ -11,7 +11,8 @@
#include "urlresolvertest.cpp"

int main(int argc, char **argv){
Sandbox s;
Sandbox(QString("%1/configroot").arg(TESTS_DATA_PATH),
Sandbox::UseAsSkeleton, Sandbox::ThisProcess);

UrlResolverTest urlResolverTest;

Expand Down
32 changes: 32 additions & 0 deletions tests/ut_urlresolver/testdata/board-mappings.ini
@@ -0,0 +1,32 @@
[file.exists]
SDK=/mer-sdk-chroot

[systeminfo.equals]

[cpuinfo.contains]
N900=Nokia RX-51 board
N950=Nokia RM-680 board
N9=Nokia RM-696 board

[arch.equals]
generic-x86=i586

[variants]
N950=N9

[N9]
family=n950-n9
adaptation-repos=n9xx-common,n950-n9

[N900]
family=n900
adaptation-repos=n9xx-common,n900

[SDK]

[generic-x86]
family=x86
adaptation-repos=x86

[UNKNOWN]
family=UNKNOWN
44 changes: 44 additions & 0 deletions tests/ut_urlresolver/testdata/repos.ini
@@ -0,0 +1,44 @@
[all]
credentials=jolla
credentials-url=https://%(ssuRegDomain)/%(ssuRegPath)/%1/credentials.xml
register-url=https://%(ssuRegDomain)/%(ssuRegPath)/%1/register.xml

[release]
jolla=https://%(packagesDomain)/releases/%(release)/jolla/%(arch)/
jolla-bad=https://%(packagesDomain)/notused-bad/%(release)/bad/%(arch)/
mer-core=https://%(packagesDomain)/%(release)/mer/%(arch)/%(debugSplit)/
adaptation-common-main=https://%(packagesDomain)/releases/%(release)/nemo/adaptation-%(deviceFamily)-common/%(arch)/
adaptation=https://%(packagesDomain)/releases/%(release)/nemo/adaptation-%(adaptation)/%(arch)/
nemo=https://%(packagesDomain)/releases/%(release)/nemo/platform/%(arch)/

[rnd]
mer-core=https://%(packagesDomain)/mer/%(release)/builds/%(arch)/%(debugSplit)/
adaptation-common-main=https://%(packagesDomain)/nemo/%(release)/adaptation-%(adaptation)-common/%(arch)/
adaptation=https://%(packagesDomain)/nemo/%(release)/adaptation-%(deviceFamily)/%(arch)/
nemo=https://%(packagesDomain)/nemo/%(release)/platform/%(arch)/
non-oss-bad=https://%(dumpDomain)/pj:/non-oss-bad%(flavour)/%(release)_%(arch)/
non-oss=https://%(dumpDomain)/pj:/non-oss%(flavour)/%(release)_%(arch)/
oss-bad=https://%(dumpDomain)/pj:/oss-bad%(flavour)/%(release)_%(arch)/
oss=https://%(dumpDomain)/pj:/oss%(flavour)/%(release)_%(arch)/

[devel-flavour]
flavour-pattern=

[release-flavour]
flavour-pattern=:/release

[testing-flavour]
flavour-pattern=:/testing

[example-domain]
dumpDomain=dump.example.com
packagesDomain=packages.example.com
ssuRegDomain=ssu.example.com
ssuRegPath=ssu/device

# fallback if domain is not matched or not set
[default-domain]
dumpDomain=dump.testing.com
packagesDomain=packages.testing.com
ssuRegDomain=ssu.testing.com
ssuRegPath=ssu/device
15 changes: 15 additions & 0 deletions tests/ut_urlresolver/testdata/ssu-defaults.ini
@@ -0,0 +1,15 @@
[General]
configVersion=2

[1]
flavour=testing
registered=false
rndRelease=latest
release=
adaptation=
ca-certificate=
credentials-scope=example

[2]
release=latest

15 changes: 15 additions & 0 deletions tests/ut_urlresolver/testdata/ssu.ini
@@ -0,0 +1,15 @@
[General]
initialized=true
flavour=testing
registered=false
rndRelease=latest
release=
adaptation=
ca-certificate=
credentials-scope=example

[repository-urls]
sample-url=http://example.com/repository/%(example)/

[repository-url-variables]
example=bunny
8 changes: 8 additions & 0 deletions tests/ut_urlresolver/ut_urlresolver.pro
Expand Up @@ -5,3 +5,11 @@ include(ut_urlresolver_dependencies.pri)
HEADERS = urlresolvertest.h
SOURCES = main.cpp \
urlresolvertest.cpp

test_data_etc.files = \
testdata/ssu.ini \

test_data_usr_share.files = \
testdata/ssu-defaults.ini \
testdata/repos.ini \
testdata/board-mappings.ini \

0 comments on commit 90b3a1e

Please sign in to comment.