Merge branch 'pilip/fix-test-sdk-type' into 'master'

tests: specify a test sdk-type

See merge request TankerHQ/sdk-rust!20

Author: blastrock

src/ctanker.rs

@@ -90,7 +90,9 @@ pub unsafe fn set_log_handler(callback: LogHandlerCallback) {
 }
 
 pub async fn create(options: Options) -> Result<CTankerPtr, Error> {
-    let sdk_type = CString::new(RUST_SDK_TYPE).unwrap();
+    let sdk_type = options
+        .sdk_type
+        .unwrap_or_else(|| CString::new(RUST_SDK_TYPE).unwrap());
     let sdk_version = CString::new(RUST_SDK_VERSION).unwrap();
     let coptions = tanker_options {
         version: 2,

src/types.rs

@@ -11,6 +11,7 @@ pub struct Options {
     pub(crate) url: Option<CString>,
     pub(crate) app_id: CString,
     pub(crate) writable_path: CString,
+    pub(crate) sdk_type: Option<CString>,
 }
 
 impl Options {
@@ -23,13 +24,19 @@ impl Options {
             url: None,
             app_id: CString::new(app_id).unwrap(),
             writable_path: CString::new(writable_path).unwrap(),
+            sdk_type: None,
         }
     }
 
     pub fn with_url(mut self, url: String) -> Self {
         self.url = Some(CString::new(url).unwrap());
         self
     }
+
+    pub fn with_sdk_type(mut self, sdk_type: String) -> Self {
+        self.sdk_type = Some(CString::new(sdk_type).unwrap());
+        self
+    }
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, UnsafeFromPrimitive)]

tests/identity/test_app.rs

@@ -39,6 +39,7 @@ impl TestApp {
     pub fn make_options(&self) -> Options {
         Options::new(self.id().to_owned(), ":memory:".to_owned())
             .with_url(self.config.api_url.clone())
+            .with_sdk_type("sdk-rust-test".to_string())
     }
 
     async fn new() -> Self {

tests/tanker_tests.rs

@@ -16,15 +16,17 @@ fn core_native_version() {
 #[tokio::test]
 async fn tanker_create() -> Result<(), Error> {
     let app = TestApp::get().await;
-    let opts = Options::new(app.id().to_owned(), ":memory:".to_string());
+    let opts = Options::new(app.id().to_owned(), ":memory:".to_string())
+        .with_sdk_type("sdk-rust-test".to_string());
     let core = Core::new(opts).await?;
     drop(core);
     Ok(())
 }
 
 #[tokio::test]
 async fn tanker_bad_create() {
-    let opts = Options::new("bad-app-id".to_string(), ":memory:".to_string());
+    let opts = Options::new("bad-app-id".to_string(), ":memory:".to_string())
+        .with_sdk_type("sdk-rust-test".to_string());
     let err = Core::new(opts)
         .await
         .expect_err("The app ID should not be accepted, it's not valid base64");