diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-09-09 15:58:01 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-09-09 15:59:29 +0300 |
| commit | 1a4a071568116f1131507f692f5618d5e5748b71 (patch) | |
| tree | 483fac35b7616980ad3b2d027b4701b2d05f4330 /tests/load | |
| parent | eb4f581b6a544a6535f771bcb7017bceca2530fc (diff) | |
Fix loader assertion failure for external repository without local cache
Now loader fetches external repositories into temporary local caches.
Diffstat (limited to 'tests/load')
| -rw-r--r-- | tests/load/1/testing/packages.manifest | 2 | ||||
| -rw-r--r-- | tests/load/driver.cxx | 16 | ||||
| -rw-r--r-- | tests/load/loadtab | 7 |
3 files changed, 12 insertions, 13 deletions
diff --git a/tests/load/1/testing/packages.manifest b/tests/load/1/testing/packages.manifest index a903878..2d458f0 100644 --- a/tests/load/1/testing/packages.manifest +++ b/tests/load/1/testing/packages.manifest @@ -1,5 +1,5 @@ : 1 -sha256sum: 5f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 +sha256sum: fac618ab9d8132777a7d2f10e338266957de02b87f233714bce2331e692f4ab6 : name: libmisc version: 2.4.0 diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index b4c43cc..8192827 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -975,8 +975,8 @@ test_pkg_repos (const cstrings& loader_args, assert (tr->location.canonical_name () == "pkg:dev.cppget.org/testing"); assert (tr->location.string () == "http://dev.cppget.org/1/testing"); - assert (tr->display_name.empty ()); - assert (tr->priority == 0); + assert (tr->display_name == "testing"); + assert (tr->priority == 3); assert (tr->interface_url && *tr->interface_url == "http://test.cppget.org/hello/"); assert (!tr->email); @@ -994,7 +994,7 @@ test_pkg_repos (const cstrings& loader_args, assert (tr->repositories_timestamp == file_mtime (tr->cache_location.path () / repositories)); - assert (!tr->internal); + assert (tr->internal); assert (tr->prerequisites.empty ()); assert (tr->complements.size () == 1); assert (tr->complements[0].load () == gr); @@ -1007,9 +1007,8 @@ test_pkg_repos (const cstrings& loader_args, db.load<package> ( package_id (tenant, package_name ("libmisc"), version ("2.4.0")))); - assert (check_external (*mpv0)); - assert (mpv0->other_repositories.size () == 1); - assert (mpv0->other_repositories[0].load () == tr); + assert (mpv0->internal_repository.load () == tr); + assert (mpv0->other_repositories.empty ()); assert (check_location (mpv0)); assert (!mpv0->buildable); @@ -1019,9 +1018,8 @@ test_pkg_repos (const cstrings& loader_args, db.load<package> ( package_id (tenant, package_name ("libmisc"), version ("2.3.0+1")))); - assert (check_external (*mpv1)); - assert (mpv1->other_repositories.size () == 1); - assert (mpv1->other_repositories[0].load () == tr); + assert (mpv1->internal_repository.load () == tr); + assert (mpv1->other_repositories.empty ()); assert (check_location (mpv1)); assert (!mpv1->buildable); diff --git a/tests/load/loadtab b/tests/load/loadtab index 96e1f00..b6ce020 100644 --- a/tests/load/loadtab +++ b/tests/load/loadtab @@ -1,4 +1,5 @@ -http://dev.cppget.org/1/stable stable cache:1/stable buildable:no +http://dev.cppget.org/1/stable stable cache:1/stable buildable:no http://dev.cppget.org/1/math math cache:1/math -http://dev.cppget.org/1/signed signed cache:pkg/1/dev.cppget.org/signed fingerprint:C3:EC:12:53:AD:64:41:0E:35:3A:9A:A6:EE:57:BF:E6:05:40:42:2B:FF:AF:2C:B0:99:AD:E9:4A:9C:48:40:22 -http://dev.cppget.org/1/unsigned unsigned cache:pkg/1/dev.cppget.org/unsigned fingerprint: +http://dev.cppget.org/1/testing testing cache:1/testing buildable:no +http://dev.cppget.org/1/signed signed cache:pkg/1/dev.cppget.org/signed fingerprint:C3:EC:12:53:AD:64:41:0E:35:3A:9A:A6:EE:57:BF:E6:05:40:42:2B:FF:AF:2C:B0:99:AD:E9:4A:9C:48:40:22 +http://dev.cppget.org/1/unsigned unsigned cache:pkg/1/dev.cppget.org/unsigned fingerprint: |