From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp62.i.mail.ru (smtp62.i.mail.ru [217.69.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id A6CFE469719 for ; Thu, 15 Oct 2020 17:33:13 +0300 (MSK) From: Nikita Pettik Date: Thu, 15 Oct 2020 17:33:08 +0300 Message-Id: Subject: [Tarantool-patches] [PATCH 0/2] Upsert upgrade test follow-up List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org As Vlad noticed (after patch was pushed) it is better to follow more extendible folder structure for upgrade tests (to ease its maintenance). This patch clean-ups current vinyl/upgrade tests and make it look the same as xlog/upgrade folder. Branch: https://github.com/tarantool/tarantool/tree/np/gh-5107-upsert-upgrade-followup Nikita Pettik (2): vinyl: remove vinyl/upgrade.test.lua vinyl: reorganize vinyl/upsert_upgrade.test.lua test/vinyl/suite.cfg | 3 - test/vinyl/suite.ini | 2 +- test/vinyl/upgrade.lua | 7 - test/vinyl/upgrade.test.lua | 20 --- .../00000000000000000000.vylog | Bin .../00000000000000000004.vylog | Bin .../00000000000000000004.xlog | Bin .../00000000000000000010.vylog | Bin .../00000000000000000010.xlog | 0 .../512/0/00000000000000000002.index | Bin .../512/0/00000000000000000002.run | Bin .../512/0/00000000000000000004.index | Bin .../512/0/00000000000000000004.run | Bin .../512/0/00000000000000000006.index | Bin .../512/0/00000000000000000006.run | Bin .../2.5.1/gh-5107-upsert-upgrade/fill.lua | 15 ++ test/vinyl/upgrade/fill.lua | 136 ------------------ .../upgrade/upsert/00000000000000000004.snap | Bin 6187 -> 0 bytes .../upgrade/upsert/00000000000000000010.snap | Bin 6188 -> 0 bytes test/vinyl/upsert_upgrade.result | 59 -------- test/vinyl/upsert_upgrade.test.lua | 32 ----- 21 files changed, 16 insertions(+), 258 deletions(-) delete mode 100644 test/vinyl/upgrade.lua delete mode 100644 test/vinyl/upgrade.test.lua rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/00000000000000000000.vylog (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/00000000000000000004.vylog (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/00000000000000000004.xlog (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/00000000000000000010.vylog (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/00000000000000000010.xlog (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/512/0/00000000000000000002.index (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/512/0/00000000000000000002.run (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/512/0/00000000000000000004.index (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/512/0/00000000000000000004.run (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/512/0/00000000000000000006.index (100%) rename test/vinyl/upgrade/{upsert => 2.5.1/gh-5107-upsert-upgrade}/512/0/00000000000000000006.run (100%) create mode 100644 test/vinyl/upgrade/2.5.1/gh-5107-upsert-upgrade/fill.lua delete mode 100644 test/vinyl/upgrade/fill.lua delete mode 100644 test/vinyl/upgrade/upsert/00000000000000000004.snap delete mode 100644 test/vinyl/upgrade/upsert/00000000000000000010.snap delete mode 100644 test/vinyl/upsert_upgrade.result delete mode 100644 test/vinyl/upsert_upgrade.test.lua -- 2.17.1