From 19cc9f7fb06ad73bc76cbb3c7430b48fcf8c68f0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 12 Nov 2021 12:43:55 +0900
Subject: [PATCH] test

---
 .github/misskey/test.yml       |  9 ++++++---
 .github/workflows/test.yml     |  4 ++--
 packages/backend/test/test.yml | 12 ------------
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 packages/backend/test/test.yml

diff --git a/.github/misskey/test.yml b/.github/misskey/test.yml
index ae18a841b..cd33f8a93 100644
--- a/.github/misskey/test.yml
+++ b/.github/misskey/test.yml
@@ -1,12 +1,15 @@
 url: 'http://misskey.local'
-port: 8080
+
+# ローカルでテストするときにポートを被らないようにするためデフォルトのものとは変える(以下同じ)
+port: 61812
+
 db:
   host: localhost
-  port: 5432
+  port: 54312
   db: test-misskey
   user: postgres
   pass: ''
 redis:
   host: localhost
-  port: 6379
+  port: 56312
 id: aid
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 045d20980..e220d714d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
     - name: Check yarn.lock
       run: git diff --exit-code yarn.lock
     - name: Copy Configure
-      run: cp test/test.yml .config
+      run: cp .github/misskey/test.yml .config
     - name: Build
       run: yarn build
     - name: Test
@@ -80,7 +80,7 @@ jobs:
     - name: Check yarn.lock
       run: git diff --exit-code yarn.lock
     - name: Copy Configure
-      run: cp test/test.yml .config
+      run: cp .github/misskey/test.yml .config
     - name: Build
       run: yarn build
     - name: Test
diff --git a/packages/backend/test/test.yml b/packages/backend/test/test.yml
deleted file mode 100644
index 2d3094653..000000000
--- a/packages/backend/test/test.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-url: 'http://misskey.local'
-port: 61812
-db:
-  host: localhost
-  port: 54312
-  db: test-misskey
-  user: postgres
-  pass: ''
-redis:
-  host: localhost
-  port: 56312
-id: aid