From 67a5cf47146765406407a06203b13b08fbd3043d Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 10 Sep 2021 12:45:06 +0200
Subject: [PATCH] fix regression tests

---
 src/api2/types/mod.rs                 |  8 ++++----
 src/tape/test/alloc_writable_media.rs | 12 ++----------
 src/tape/test/compute_media_state.rs  | 19 +++++++------------
 src/tape/test/current_set_usable.rs   | 11 +++--------
 src/tape/test/inventory.rs            |  6 ++----
 tests/worker-task-abort.rs            |  6 ++++--
 6 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs
index c9f3dd5e..50b928ed 100644
--- a/src/api2/types/mod.rs
+++ b/src/api2/types/mod.rs
@@ -22,15 +22,12 @@ pub const FILENAME_FORMAT: ApiStringFormat = ApiStringFormat::VerifyFn(|name| {
 });
 
 
-// Complex type definitions
-
-
 // Regression tests
 
 #[test]
 fn test_cert_fingerprint_schema() -> Result<(), anyhow::Error> {
 
-    let schema = CERT_FINGERPRINT_SHA256_SCHEMA;
+    let schema = pbs_api_types::CERT_FINGERPRINT_SHA256_SCHEMA;
 
     let invalid_fingerprints = [
         "86:88:7c:be:26:77:a5:62:67:d9:06:f5:e4::61:3e:20:dc:cd:43:92:07:7f:fb:65:54:6c:ff:d2:96:36:f8",
@@ -70,6 +67,9 @@ fn test_cert_fingerprint_schema() -> Result<(), anyhow::Error> {
 
 #[test]
 fn test_proxmox_user_id_schema() -> Result<(), anyhow::Error> {
+
+    use pbs_api_types::Userid;
+
     let invalid_user_ids = [
         "x", // too short
         "xx", // too short
diff --git a/src/tape/test/alloc_writable_media.rs b/src/tape/test/alloc_writable_media.rs
index 7df6c99f..5bf41ddf 100644
--- a/src/tape/test/alloc_writable_media.rs
+++ b/src/tape/test/alloc_writable_media.rs
@@ -6,17 +6,9 @@ use std::path::PathBuf;
 use anyhow::Error;
 
 use pbs_systemd::time::parse_time_span;
+use pbs_api_types::{RetentionPolicy, MediaSetPolicy};
 
-use crate::{
-    api2::types::{
-        MediaSetPolicy,
-        RetentionPolicy,
-    },
-    tape::{
-        Inventory,
-        MediaPool,
-    },
-};
+use crate::tape::{Inventory, MediaPool};
 
 fn create_testdir(name: &str) -> Result<PathBuf, Error> {
     let mut testdir: PathBuf = String::from("./target/testout").into();
diff --git a/src/tape/test/compute_media_state.rs b/src/tape/test/compute_media_state.rs
index 459359ea..9cf76279 100644
--- a/src/tape/test/compute_media_state.rs
+++ b/src/tape/test/compute_media_state.rs
@@ -9,18 +9,13 @@ use proxmox::tools::{
     Uuid,
 };
 
-use crate::{
-    api2::types::{
-        MediaStatus,
-        MediaSetPolicy,
-        RetentionPolicy,
-    },
-    tape::{
-        Inventory,
-        MediaPool,
-        file_formats::{
-            MediaSetLabel,
-        },
+use pbs_api_types::{MediaStatus, MediaSetPolicy, RetentionPolicy};
+
+use crate::tape::{
+    Inventory,
+    MediaPool,
+    file_formats::{
+        MediaSetLabel,
     },
 };
 
diff --git a/src/tape/test/current_set_usable.rs b/src/tape/test/current_set_usable.rs
index 924f257b..2f3063be 100644
--- a/src/tape/test/current_set_usable.rs
+++ b/src/tape/test/current_set_usable.rs
@@ -5,19 +5,14 @@
 use std::path::PathBuf;
 use anyhow::Error;
 
-use proxmox::tools::{
-    Uuid,
-};
+use proxmox::tools::Uuid;
+
+use pbs_api_types::{RetentionPolicy, MediaSetPolicy};
 
 use crate::{
-    api2::types::{
-        MediaSetPolicy,
-        RetentionPolicy,
-    },
     tape::{
         Inventory,
         MediaPool,
-
         file_formats::{
             MediaSetLabel,
         },
diff --git a/src/tape/test/inventory.rs b/src/tape/test/inventory.rs
index 3aa58265..8c74ac1c 100644
--- a/src/tape/test/inventory.rs
+++ b/src/tape/test/inventory.rs
@@ -9,11 +9,9 @@ use proxmox::tools::{
     Uuid,
 };
 
+use pbs_api_types::{MediaLocation, MediaStatus};
+
 use crate::{
-    api2::types::{
-        MediaLocation,
-        MediaStatus,
-    },
     tape::{
         Inventory,
         file_formats::{
diff --git a/tests/worker-task-abort.rs b/tests/worker-task-abort.rs
index 1a0d938d..a36cca98 100644
--- a/tests/worker-task-abort.rs
+++ b/tests/worker-task-abort.rs
@@ -8,6 +8,8 @@ extern crate nix;
 
 use proxmox::try_block;
 
+use pbs_api_types::{Authid, UPID};
+
 use proxmox_backup::server;
 use proxmox_backup::tools;
 
@@ -59,7 +61,7 @@ fn worker_task_abort() -> Result<(), Error> {
         let res = server::WorkerTask::new_thread(
             "garbage_collection",
             None,
-            proxmox_backup::api2::types::Authid::root_auth_id().clone(),
+            Authid::root_auth_id().clone(),
             true,
             move |worker| {
                 println!("WORKER {}", worker);
@@ -84,7 +86,7 @@ fn worker_task_abort() -> Result<(), Error> {
             }
             Ok(wid) => {
                 println!("WORKER: {}", wid);
-                server::abort_worker_async(wid.parse::<server::UPID>().unwrap());
+                server::abort_worker_async(wid.parse::<UPID>().unwrap());
             }
         }
     });