diff options
author | Andrey Loskutov | 2021-09-15 07:10:41 +0000 |
---|---|---|
committer | Mickael Istria | 2021-09-15 15:34:53 +0000 |
commit | 9f07d96d23111babe8127b36d172e736d64f9a3f (patch) | |
tree | e6b65fb34da8d73ca23e2821067a66ea315e8018 | |
parent | 53ee3115279481f88f0c58b41043c47f66d4a4e2 (diff) | |
download | rt.equinox.p2-I20210916-1800.tar.gz rt.equinox.p2-I20210916-1800.tar.xz rt.equinox.p2-I20210916-1800.zip |
Bug 575991 - MetadataRepositoryManagerTest.testMetadataCachingRemoteRepoS4_22_0_M1I20211005-1800I20211004-2030I20211003-1800I20211002-1800I20211002-0220I20211001-1800I20210929-1800I20210929-0600I20210928-1800I20210928-0600I20210927-1800I20210927-0600I20210926-1800I20210926-0600I20210925-1800I20210925-0600I20210924-1800I20210924-0200I20210923-1800I20210922-1800I20210921-1800I20210920-1800I20210919-1800I20210919-0120I20210918-1800I20210917-1800I20210917-0000I20210916-2150I20210916-1800I20210915-1800
fails
Cache directory also change as the new repo uses content.xml.xz, which
goes through XZedSimpleMetadataRepositoryFactory, which calls different
methods of CacheManager resulting in different directories.
+ use HTTPS where necessary
Change-Id: I5410ffc8e495258fb2dcf83fdf493d16b4cc9512
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.p2/+/185450
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
4 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF index fc73bbdd1..e1bf45b62 100644 --- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.tests;singleton:=true -Bundle-Version: 1.8.400.qualifier +Bundle-Version: 1.8.500.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.equinox.p2.tests.TestActivator Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml index 619c4d425..91d6ea953 100644 --- a/bundles/org.eclipse.equinox.p2.tests/pom.xml +++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml @@ -16,7 +16,7 @@ <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.tests</artifactId> - <version>1.8.400-SNAPSHOT</version> + <version>1.8.500-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/TransferTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/TransferTest.java index 6af6b822c..718db58cc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/TransferTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/TransferTest.java @@ -41,7 +41,8 @@ public class TransferTest extends AbstractProvisioningTest { } catch (BundleException e) { fail("1.5", e); } - final URI toDownload = new URI("http://download.eclipse.org/eclipse/updates/4.11/R-4.11-201903070500/plugins/javax.servlet.jsp_2.2.0.v201112011158.jar.pack.gz"); + final URI toDownload = new URI( + "https://download.eclipse.org/eclipse/updates/4.11/R-4.11-201903070500/plugins/javax.servlet.jsp_2.2.0.v201112011158.jar.pack.gz"); IStatus s = getTransport().download(toDownload, fos, new NullProgressMonitor()); assertOK("2.0", s); int httpSize = -1; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java index 2b4ebef6a..0f6b422d7 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java @@ -379,11 +379,11 @@ public class MetadataRepositoryManagerTest extends AbstractProvisioningTest { * cache is updated when it becomes stale. */ public void testMetadataCachingRemoteRepo() throws URISyntaxException, ProvisionException { - URI repoLocation = new URI("http://download.eclipse.org/eclipse/updates/3.4milestones/"); + URI repoLocation = new URI("https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/"); if (!repoAvailable(repoLocation)) return; IAgentLocation agentLocation = ServiceHelper.getService(TestActivator.getContext(), IAgentLocation.class); - URI dataArea = agentLocation.getDataArea("org.eclipse.equinox.p2.metadata.repository/cache/"); + URI dataArea = agentLocation.getDataArea("org.eclipse.equinox.p2.repository/cache/"); File dataAreaFile = URIUtil.toFile(dataArea); File cacheFileXML = new File(dataAreaFile, "content" + repoLocation.hashCode() + ".xml"); File cacheFileJAR = new File(dataAreaFile, "content" + repoLocation.hashCode() + ".jar"); |