test/system: Add function for setting up environment

Instead of typing out two function names to set up the test environment,
type out only one. We never know if a new set up function will show up.

https://github.com/containers/toolbox/pull/818

test/system/000-setup.bats

@@ -3,8 +3,7 @@
 load 'libs/helpers'
 
 @test "test suite: Setup" {
-    # Setup container storage paths
+    _setup_environment
-    setup_containers_store
     # Cache the default image for the system
     _pull_and_cache_distro_image $(get_system_id) $(get_system_version) || die
     # Cache all images that will be needed during the tests

test/system/001-version.bats

@@ -4,6 +4,10 @@ load 'libs/bats-support/load'
 load 'libs/bats-assert/load'
 load 'libs/helpers.bash'
 
+setup() {
+  _setup_environment
+}
+
 @test "version: Check version using option --version" {
   run $TOOLBOX --version
 

test/system/002-help.bats

@@ -5,7 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers.bash'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
 }
 
 @test "help: Run command 'help'" {

test/system/100-root.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store  
   cleanup_containers
 }
 

test/system/101-create.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store
   cleanup_containers
 }
 

test/system/102-list.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store
   cleanup_all
 }
 

test/system/103-container.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store
   cleanup_containers
 }
 

test/system/104-run.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store
   cleanup_containers
 }
 

test/system/105-enter.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store
   cleanup_containers
 }
 

test/system/106-rm.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store
   cleanup_containers
 }
 

test/system/107-rmi.bats

@@ -5,8 +5,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
-  check_xdg_runtime_dir
+  _setup_environment
-  setup_containers_store
   cleanup_all
 }
 

test/system/libs/helpers.bash

@@ -31,6 +31,11 @@ function cleanup_containers() {
 }
 
 
+function _setup_environment() {
+  _setup_containers_store
+  check_xdg_runtime_dir
+}
+
 function _setup_containers_store() {
   mkdir -p ${TEMP_STORAGE_DIR}
   # Setup a storage config file for PODMAN