Revert "break up tests to try to appease shellcheck"

This reverts commit 7bdd77b.

Author: KyFaSt

test/test-ghe-backup.sh

@@ -618,8 +618,7 @@ begin_test "ghe-backup does not take backup of encrypted column current encrypti
 )
 end_test
 
-# encrypted column current encryption key needs to be backed up for versions 3.8.0+
-begin_test "ghe-backup takes backup of encrypted column current encryption key for versions 3.8.0"
+begin_test "ghe-backup takes backup of encrypted column current encryption key for versions 3.8.0+"
 (
   set -e
 
@@ -643,21 +642,6 @@ begin_test "ghe-backup takes backup of encrypted column current encryption key f
   for file in "${required_files[@]}"; do
     [ "$(cat "$GHE_DATA_DIR/current/$file")" = "foo" ]
   done
-)
-end_test
-
-# encrypted column current encryption key needs to be backed up for versions 3.8.0+
-begin_test "ghe-backup takes backup of encrypted column current encryption key for versions 3.9.0"
-(
-  set -e
-
-  required_secrets=(
-    "secrets.github.encrypted-column-current-encryption-key"
-  )
-
-  for secret in "${required_secrets[@]}"; do
-    ghe-ssh "$GHE_HOSTNAME" -- ghe-config "$secret" "foo"
-  done
 
   # GHES version 3.9.0
   GHE_REMOTE_VERSION=3.9.0

test/test-ghe-restore.sh

@@ -344,9 +344,7 @@ begin_test "ghe-restore does not encrypted column current encryption key for ver
 )
 end_test
 
-
-# encrypted column current encryption key needs to be restored for versions 3.8.0+
-begin_test "ghe-restore with encrypted column current encryption key for versions 3.8.0"
+begin_test "ghe-restore with encrypted column current encryption key for versions 3.8.0+"
 (
   set -e
   rm -rf "$GHE_REMOTE_ROOT_DIR"
@@ -371,23 +369,7 @@ begin_test "ghe-restore with encrypted column current encryption key for version
   for secret in "${required_secrets[@]}"; do
     [ "$(ghe-ssh "$GHE_HOSTNAME" -- ghe-config "$secret")" = "foo" ]
   done
-)
-end_test
-
-# encrypted column current encryption key needs to be restored for versions 3.8.0+
-begin_test "ghe-restore with encrypted column current encryption key for versions 3.9.0"
-(
-  set -e
-  rm -rf "$GHE_REMOTE_ROOT_DIR"
-  setup_remote_metadata
 
-  required_files=(
-    "encrypted-column-current-encryption-key"
-  )
-
-  for file in "${required_files[@]}"; do
-    echo "foo" > "$GHE_DATA_DIR/current/$file"
-  done
 
   # GHES version 3.9.0
   GHE_REMOTE_VERSION=3.9.0