The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7407
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
From 55fa0f5ba00daf4c07370a34ffcc71af549f19f7 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Thu, 21 May 2020 15:28:56 +0100
Subject: [PATCH] test: btrfs import tests
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
test/main.sh | 220 +++++++++++++++++++++---------------------
test/suites/backup.sh | 6 ++
2 files changed, 116 insertions(+), 110 deletions(-)
diff --git a/test/main.sh b/test/main.sh
index 8219df0990..ac30a092d2 100755
--- a/test/main.sh
+++ b/test/main.sh
@@ -154,117 +154,117 @@ if [ "$#" -gt 0 ]; then
exit
fi
-run_test test_check_deps "checking dependencies"
-run_test test_static_analysis "static analysis"
-run_test test_database_update "database schema updates"
-run_test test_database_restore "database restore"
-run_test test_database_no_disk_space "database out of disk space"
-run_test test_sql "lxd sql"
-run_test test_basic_usage "basic usage"
-run_test test_remote_url "remote url handling"
-run_test test_remote_admin "remote administration"
-run_test test_remote_usage "remote usage"
-run_test test_clustering_enable "clustering enable"
-run_test test_clustering_membership "clustering membership"
-run_test test_clustering_containers "clustering containers"
-run_test test_clustering_storage "clustering storage"
-run_test test_clustering_storage_single_node "clustering storage single node"
-run_test test_clustering_network "clustering network"
-run_test test_clustering_publish "clustering publish"
-run_test test_clustering_profiles "clustering profiles"
-run_test test_clustering_join_api "clustering join api"
-run_test test_clustering_shutdown_nodes "clustering shutdown"
-run_test test_clustering_projects "clustering projects"
-run_test test_clustering_address "clustering address"
-run_test test_clustering_image_replication "clustering image replication"
-run_test test_clustering_dns "clustering DNS"
-run_test test_clustering_recover "clustering recovery"
-run_test test_clustering_handover "clustering handover"
-run_test test_clustering_rebalance "clustering rebalance"
-run_test test_clustering_remove_raft_node "custering remove raft node"
-# run_test test_clustering_upgrade "clustering upgrade"
-run_test test_projects_default "default project"
-run_test test_projects_crud "projects CRUD operations"
-run_test test_projects_containers "containers inside projects"
-run_test test_projects_snapshots "snapshots inside projects"
-run_test test_projects_backups "backups inside projects"
-run_test test_projects_profiles "profiles inside projects"
-run_test test_projects_profiles_default "profiles from the global default
project"
-run_test test_projects_images "images inside projects"
-run_test test_projects_images_default "images from the global default project"
-run_test test_projects_storage "projects and storage pools"
-run_test test_projects_network "projects and networks"
-run_test test_projects_limits "projects limits"
-run_test test_projects_restrictions "projects restrictions"
-run_test test_container_devices_disk "container devices - disk"
-run_test test_container_devices_nic_p2p "container devices - nic - p2p"
-run_test test_container_devices_nic_bridged "container devices - nic - bridged"
-run_test test_container_devices_nic_bridged_filtering "container devices - nic
- bridged - filtering"
-run_test test_container_devices_nic_physical "container devices - nic -
physical"
-run_test test_container_devices_nic_macvlan "container devices - nic - macvlan"
-run_test test_container_devices_nic_ipvlan "container devices - nic - ipvlan"
-run_test test_container_devices_nic_sriov "container devices - nic - sriov"
-run_test test_container_devices_nic_routed "container devices - nic - routed"
-run_test test_container_devices_infiniband_physical "container devices -
infiniband - physical"
-run_test test_container_devices_infiniband_sriov "container devices -
infiniband - sriov"
-run_test test_container_devices_proxy "container devices - proxy"
-run_test test_container_devices_gpu "container devices - gpu"
-run_test test_container_devices_unix_char "container devices - unix-char"
-run_test test_container_devices_unix_block "container devices - unix-block"
-run_test test_security "security features"
-run_test test_security_protection "container protection"
-run_test test_image_expiry "image expiry"
-run_test test_image_list_all_aliases "image list all aliases"
-run_test test_image_auto_update "image auto-update"
-run_test test_image_prefer_cached "image prefer cached"
-run_test test_image_import_dir "import image from directory"
-run_test test_concurrent_exec "concurrent exec"
-run_test test_concurrent "concurrent startup"
-run_test test_snapshots "container snapshots"
-run_test test_snap_restore "snapshot restores"
-run_test test_snap_expiry "snapshot expiry"
-run_test test_config_profiles "profiles and configuration"
-run_test test_config_edit "container configuration edit"
-run_test test_config_edit_container_snapshot_pool_config "container and
snapshot volume configuration edit"
-run_test test_container_metadata "manage container metadata and templates"
-run_test test_container_snapshot_config "container snapshot configuration"
-run_test test_server_config "server configuration"
-run_test test_filemanip "file manipulations"
-run_test test_network "network management"
-run_test test_idmap "id mapping"
-run_test test_template "file templating"
-run_test test_pki "PKI mode"
-run_test test_devlxd "/dev/lxd"
-run_test test_fuidshift "fuidshift"
-run_test test_migration "migration"
-run_test test_fdleak "fd leak"
-run_test test_storage "storage"
-run_test test_storage_volume_snapshots "storage volume snapshots"
-run_test test_init_auto "lxd init auto"
-run_test test_init_interactive "lxd init interactive"
-run_test test_init_preseed "lxd init preseed"
-run_test test_storage_profiles "storage profiles"
-run_test test_container_import "container import"
-run_test test_storage_volume_attach "attaching storage volumes"
-run_test test_storage_driver_btrfs "btrfs storage driver"
-run_test test_storage_driver_ceph "ceph storage driver"
-run_test test_storage_driver_cephfs "cephfs storage driver"
-run_test test_resources "resources"
-run_test test_kernel_limits "kernel limits"
-run_test test_macaroon_auth "macaroon authentication"
-run_test test_console "console"
-run_test test_query "query"
-run_test test_storage_local_volume_handling "storage local volume handling"
+#run_test test_check_deps "checking dependencies"
+#run_test test_static_analysis "static analysis"
+#run_test test_database_update "database schema updates"
+#run_test test_database_restore "database restore"
+#run_test test_database_no_disk_space "database out of disk space"
+#run_test test_sql "lxd sql"
+#run_test test_basic_usage "basic usage"
+#run_test test_remote_url "remote url handling"
+#run_test test_remote_admin "remote administration"
+#run_test test_remote_usage "remote usage"
+#run_test test_clustering_enable "clustering enable"
+#run_test test_clustering_membership "clustering membership"
+#run_test test_clustering_containers "clustering containers"
+#run_test test_clustering_storage "clustering storage"
+#run_test test_clustering_storage_single_node "clustering storage single node"
+#run_test test_clustering_network "clustering network"
+#run_test test_clustering_publish "clustering publish"
+#run_test test_clustering_profiles "clustering profiles"
+#run_test test_clustering_join_api "clustering join api"
+#run_test test_clustering_shutdown_nodes "clustering shutdown"
+#run_test test_clustering_projects "clustering projects"
+#run_test test_clustering_address "clustering address"
+#run_test test_clustering_image_replication "clustering image replication"
+#run_test test_clustering_dns "clustering DNS"
+#run_test test_clustering_recover "clustering recovery"
+#run_test test_clustering_handover "clustering handover"
+#run_test test_clustering_rebalance "clustering rebalance"
+#run_test test_clustering_remove_raft_node "custering remove raft node"
+## run_test test_clustering_upgrade "clustering upgrade"
+#run_test test_projects_default "default project"
+#run_test test_projects_crud "projects CRUD operations"
+#run_test test_projects_containers "containers inside projects"
+#run_test test_projects_snapshots "snapshots inside projects"
+#run_test test_projects_backups "backups inside projects"
+#run_test test_projects_profiles "profiles inside projects"
+#run_test test_projects_profiles_default "profiles from the global default
project"
+#run_test test_projects_images "images inside projects"
+#run_test test_projects_images_default "images from the global default project"
+#run_test test_projects_storage "projects and storage pools"
+#run_test test_projects_network "projects and networks"
+#run_test test_projects_limits "projects limits"
+#run_test test_projects_restrictions "projects restrictions"
+#run_test test_container_devices_disk "container devices - disk"
+#run_test test_container_devices_nic_p2p "container devices - nic - p2p"
+#run_test test_container_devices_nic_bridged "container devices - nic -
bridged"
+#run_test test_container_devices_nic_bridged_filtering "container devices -
nic - bridged - filtering"
+#run_test test_container_devices_nic_physical "container devices - nic -
physical"
+#run_test test_container_devices_nic_macvlan "container devices - nic -
macvlan"
+#run_test test_container_devices_nic_ipvlan "container devices - nic - ipvlan"
+#run_test test_container_devices_nic_sriov "container devices - nic - sriov"
+#run_test test_container_devices_nic_routed "container devices - nic - routed"
+#run_test test_container_devices_infiniband_physical "container devices -
infiniband - physical"
+#run_test test_container_devices_infiniband_sriov "container devices -
infiniband - sriov"
+#run_test test_container_devices_proxy "container devices - proxy"
+#run_test test_container_devices_gpu "container devices - gpu"
+#run_test test_container_devices_unix_char "container devices - unix-char"
+#run_test test_container_devices_unix_block "container devices - unix-block"
+#run_test test_security "security features"
+#run_test test_security_protection "container protection"
+#run_test test_image_expiry "image expiry"
+#run_test test_image_list_all_aliases "image list all aliases"
+#run_test test_image_auto_update "image auto-update"
+#run_test test_image_prefer_cached "image prefer cached"
+#run_test test_image_import_dir "import image from directory"
+#run_test test_concurrent_exec "concurrent exec"
+#run_test test_concurrent "concurrent startup"
+#run_test test_snapshots "container snapshots"
+#run_test test_snap_restore "snapshot restores"
+#run_test test_snap_expiry "snapshot expiry"
+#run_test test_config_profiles "profiles and configuration"
+#run_test test_config_edit "container configuration edit"
+#run_test test_config_edit_container_snapshot_pool_config "container and
snapshot volume configuration edit"
+#run_test test_container_metadata "manage container metadata and templates"
+#run_test test_container_snapshot_config "container snapshot configuration"
+#run_test test_server_config "server configuration"
+#run_test test_filemanip "file manipulations"
+#run_test test_network "network management"
+#run_test test_idmap "id mapping"
+#run_test test_template "file templating"
+#run_test test_pki "PKI mode"
+#run_test test_devlxd "/dev/lxd"
+#run_test test_fuidshift "fuidshift"
+#run_test test_migration "migration"
+#run_test test_fdleak "fd leak"
+#run_test test_storage "storage"
+#run_test test_storage_volume_snapshots "storage volume snapshots"
+#run_test test_init_auto "lxd init auto"
+#run_test test_init_interactive "lxd init interactive"
+#run_test test_init_preseed "lxd init preseed"
+#run_test test_storage_profiles "storage profiles"
+#run_test test_container_import "container import"
+#run_test test_storage_volume_attach "attaching storage volumes"
+#run_test test_storage_driver_btrfs "btrfs storage driver"
+#run_test test_storage_driver_ceph "ceph storage driver"
+#run_test test_storage_driver_cephfs "cephfs storage driver"
+#run_test test_resources "resources"
+#run_test test_kernel_limits "kernel limits"
+#run_test test_macaroon_auth "macaroon authentication"
+#run_test test_console "console"
+#run_test test_query "query"
+#run_test test_storage_local_volume_handling "storage local volume handling"
run_test test_backup_import "backup import"
-run_test test_backup_export "backup export"
-run_test test_backup_rename "backup rename"
-run_test test_container_local_cross_pool_handling "container local cross pool
handling"
-run_test test_incremental_copy "incremental container copy"
-run_test test_profiles_project_default "profiles in default project"
-run_test test_profiles_project_images_profiles "profiles in project with
images and profiles enabled"
-run_test test_profiles_project_images "profiles in project with images enabled
and profiles disabled"
-run_test test_profiles_project_profiles "profiles in project with images
disabled and profiles enabled"
-run_test test_filtering "API filtering"
+#run_test test_backup_export "backup export"
+#run_test test_backup_rename "backup rename"
+#run_test test_container_local_cross_pool_handling "container local cross pool
handling"
+#run_test test_incremental_copy "incremental container copy"
+#run_test test_profiles_project_default "profiles in default project"
+#run_test test_profiles_project_images_profiles "profiles in project with
images and profiles enabled"
+#run_test test_profiles_project_images "profiles in project with images
enabled and profiles disabled"
+#run_test test_profiles_project_profiles "profiles in project with images
disabled and profiles enabled"
+#run_test test_filtering "API filtering"
# shellcheck disable=SC2034
TEST_RESULT=success
diff --git a/test/suites/backup.sh b/test/suites/backup.sh
index e006ada601..a7fda22209 100644
--- a/test/suites/backup.sh
+++ b/test/suites/backup.sh
@@ -156,6 +156,11 @@ test_container_import() {
}
test_backup_import() {
+ lxd_backend=$(storage_backend "$LXD_DIR")
+ if [ "$lxd_backend" != "btrfs" ] ; then
+ return
+ fi
+
test_backup_import_with_project
test_backup_import_with_project foo
}
@@ -187,6 +192,7 @@ test_backup_import_with_project() {
# create backup
if [ "$lxd_backend" = "btrfs" ] || [ "$lxd_backend" = "zfs" ]; then
lxc export c1 "${LXD_DIR}/c1-optimized.tar.gz" --optimized-storage
--instance-only
+ tar tzvf "${LXD_DIR}/c1-optimized.tar.gz"
fi
lxc export c1 "${LXD_DIR}/c1.tar.gz" --instance-only
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
