From 7a459ef2ba6b22352c87ca3cea5b8094345b4798 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 16 May 2023 20:19:16 +0200
Subject: [PATCH] Update repositories for the Git migration

The [community] repository is merged into the [extra] repository during
the Git migration. [testing] is replaced with [core-testing] and
[extra-testing].
---
 pacman/arch/x86_64/pacman.conf |  9 +++------
 test/test_group.py             | 12 ++++++------
 tracker/pacman.py              |  2 +-
 tracker/view/show.py           |  4 ++--
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pacman/arch/x86_64/pacman.conf b/pacman/arch/x86_64/pacman.conf
index fc164c31..e1de6fb7 100644
--- a/pacman/arch/x86_64/pacman.conf
+++ b/pacman/arch/x86_64/pacman.conf
@@ -69,19 +69,16 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[testing]
+[core-testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-[community-testing]
+[extra-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
diff --git a/test/test_group.py b/test/test_group.py
index a11f5926..7d62aa1a 100644
--- a/test/test_group.py
+++ b/test/test_group.py
@@ -116,10 +116,10 @@ def test_edit_group_bug_url_core(db, client):
     set_and_assert_group_data(db, client, url_for('tracker.add_group'), bug_ticket='')
 
 
-@create_package(name='foo', version='1.2.3-4', database='community')
+@create_package(name='foo', version='1.2.3-4', database='extra')
 @logged_in
-def test_edit_group_bug_url_community(db, client):
-    set_and_assert_group_data(db, client, url_for('tracker.add_group'), bug_ticket='', database='community')
+def test_edit_group_bug_url_extra(db, client):
+    set_and_assert_group_data(db, client, url_for('tracker.add_group'), bug_ticket='', database='extra')
 
 
 def test_add_needs_login(db, client):
@@ -392,10 +392,10 @@ def test_affected_to_status_testing_only(db, client):
     status = affected_to_status(Affected.affected, 'foo', avg.fixed)
     assert status == Status.testing
 
-@create_package(name='foo', version='1.2.3-3', database='community')
-@create_package(name='foo', version='1.2.3-4', database='community-testing')
+@create_package(name='foo', version='1.2.3-3', database='extra')
+@create_package(name='foo', version='1.2.3-4', database='extra-testing')
 @create_group(id=DEFAULT_GROUP_ID, packages=['foo'], affected='1.2.3-3', fixed='1.2.3-4')
-def test_affected_to_status_community_testing(db, client):
+def test_affected_to_status_extra_testing(db, client):
     avg = CVEGroup.query.get(DEFAULT_GROUP_ID)
     status = affected_to_status(Affected.affected, 'foo', avg.fixed)
     assert status == Status.testing
diff --git a/tracker/pacman.py b/tracker/pacman.py
index 0a1455b6..7aa6747c 100644
--- a/tracker/pacman.py
+++ b/tracker/pacman.py
@@ -11,7 +11,7 @@
 
 archs = ['x86_64']
 primary_arch = 'x86_64'
-repos = {'x86_64': ['core', 'extra', 'community', 'multilib', 'testing', 'community-testing', 'multilib-testing']}
+repos = {'x86_64': ['core', 'core-testing', 'extra', 'extra-testing', 'multilib', 'multilib-testing']}
 configpath = './pacman/arch/{}/pacman.conf'
 handles = {}
 chdir(basedir)
diff --git a/tracker/view/show.py b/tracker/view/show.py
index fd555df8..0e89a4b0 100644
--- a/tracker/view/show.py
+++ b/tracker/view/show.py
@@ -52,8 +52,8 @@
 
 def get_bug_project(databases):
     bug_project_mapping = {
-        1: ['core', 'extra', 'testing'],
-        5: ['community', 'community-testing', 'multilib', 'multilib-testing']
+        1: ['core', 'core-testing', 'extra', 'extra-testing'],
+        5: ['multilib', 'multilib-testing']
     }
 
     for category, repos in bug_project_mapping.items():