Update sapp-4.3.59.c5b96a4 stellar-on-sapp-2.1.2.20b65ae

5 files changed, 6 insertions, 4 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0d66ba6..80ef442 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,11 +23,13 @@ set(TEST_MAIN ${TEST_RUN_DIR}/plugin_test_main)
 # copy perf main
 add_test(NAME MKDIR_PERF COMMAND sh -c "mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/perf/ ${CMAKE_CURRENT_BINARY_DIR}/perf/etc/dns/")
 add_test(NAME COPY_PERF_TEST_MAIN COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/dns_decoder_perf_test ${CMAKE_CURRENT_BINARY_DIR}/perf")
-add_test(NAME COPY_PERF_TEST_CONF COMMAND sh -c "cp ${PROJECT_SOURCE_DIR}/bin/${PROJECT_NAME}.toml ${CMAKE_CURRENT_BINARY_DIR}/etc/dns/${PROJECT_NAME}.toml")
+add_test(NAME COPY_PERF_TEST_CONF COMMAND sh -c "cp ${PROJECT_SOURCE_DIR}/bin/${PROJECT_NAME}.toml ${CMAKE_CURRENT_BINARY_DIR}/perf/etc/dns/${PROJECT_NAME}.toml")
 
 # assemble test env
-add_test(NAME INSTALL_TEST_MAIN COMMAND sh -c "rpm -i ${CMAKE_CURRENT_SOURCE_DIR}/env/sapp-4.3.57.16ea514-1.el8.x86_64.rpm --prefix=${CMAKE_CURRENT_BINARY_DIR}/sapp --force --nodeps")
-add_test(NAME INSTALL_STELLAR COMMAND sh -c "rpm -i ${CMAKE_CURRENT_SOURCE_DIR}/env/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpm --prefix=${CMAKE_CURRENT_BINARY_DIR}/ --force --nodeps")
+add_test(NAME UNINSTALL_TEST_MAIN COMMAND sh -c "rpm -qa sapp | grep -v not | xargs -i rpm -e {} --nodeps")
+add_test(NAME INSTALL_TEST_MAIN COMMAND sh -c "rpm -i ${CMAKE_CURRENT_SOURCE_DIR}/env/sapp-4.3.59.c5b96a4-1.el8.x86_64.rpm --prefix=${CMAKE_CURRENT_BINARY_DIR}/sapp --force --nodeps")
+add_test(NAME UNINSTALL_STELLAR COMMAND sh -c "rpm -qa stellar-on-sapp | grep -v not | xargs -i rpm -e {} --nodeps")
+add_test(NAME INSTALL_STELLAR COMMAND sh -c "rpm -i ${CMAKE_CURRENT_SOURCE_DIR}/env/stellar-on-sapp-2.1.2.20b65ae-1.el8.x86_64.rpm --prefix=${CMAKE_CURRENT_BINARY_DIR}/ --force --nodeps")
 
 add_test(NAME COPY_TEST_MAIN COMMAND sh -c "cp ${TEST_RUN_DIR}/tools/plugin_test_main ${TEST_RUN_DIR}/plugin_test_main")
 add_test(NAME COPY_SPEC COMMAND sh -c "cp ${CMAKE_CURRENT_SOURCE_DIR}/env/spec.toml ${TEST_RUN_DIR}/stellar_plugin/spec.toml")
@@ -45,7 +47,7 @@ add_test(NAME UPDATE_TEST_SO COMMAND sh -c "cp ${CMAKE_CURRENT_BINARY_DIR}/${PRO
 add_test(NAME MKDIR_PLUG_CONF COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/etc/dns/")
 add_test(NAME UPDATE_PLUG_CONF COMMAND sh -c "cp ${PROJECT_SOURCE_DIR}/bin/${PROJECT_NAME}.toml ${TEST_RUN_DIR}/etc/dns/${PROJECT_NAME}.toml")
 
-set_tests_properties(INSTALL_TEST_MAIN UPDATE_SAPP_LOG COPY_CONFLIST COPY_INF COPY_TEST_MAIN COPY_SPEC UPDATE_PLUG_SO UPDATE_TEST_SO MKDIR_PLUG_CONF UPDATE_PLUG_CONF PROPERTIES FIXTURES_SETUP TestFixture)
+set_tests_properties(INSTALL_TEST_MAIN INSTALL_STELLAR UPDATE_SAPP_LOG COPY_CONFLIST COPY_INF COPY_TEST_MAIN COPY_SPEC UPDATE_PLUG_SO UPDATE_TEST_SO MKDIR_PLUG_CONF UPDATE_PLUG_CONF PROPERTIES FIXTURES_SETUP TestFixture)
 
 # run tests
 add_test(NAME MKDIR_METRICS COMMAND sh -c "mkdir -p ${TEST_RUN_DIR}/metrics/")
diff --git a/test/env/sapp-4.3.57.16ea514-1.el8.x86_64.rpm b/test/env/sapp-4.3.57.16ea514-1.el8.x86_64.rpm
deleted file mode 100644
index d1edc72..0000000
--- a/test/env/sapp-4.3.57.16ea514-1.el8.x86_64.rpm
+++ /dev/null
diff --git a/test/env/sapp-4.3.59.c5b96a4-1.el8.x86_64.rpm b/test/env/sapp-4.3.59.c5b96a4-1.el8.x86_64.rpm
new file mode 100644
index 0000000..bde75e6
--- /dev/null
+++ b/test/env/sapp-4.3.59.c5b96a4-1.el8.x86_64.rpm
diff --git a/test/env/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpm b/test/env/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpm
deleted file mode 100644
index 695d6bc..0000000
--- a/test/env/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpm
+++ /dev/null
diff --git a/test/env/stellar-on-sapp-2.1.2.20b65ae-1.el8.x86_64.rpm b/test/env/stellar-on-sapp-2.1.2.20b65ae-1.el8.x86_64.rpm
new file mode 100644
index 0000000..c893ec9
--- /dev/null
+++ b/test/env/stellar-on-sapp-2.1.2.20b65ae-1.el8.x86_64.rpm