tests: Fix build failures

Also update copyrights where appropriate.
canonical · Apr 16, 2019 · 30475a3 · 30475a3
1 parent f4ee636
commit 30475a3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/include/multipass/url_downloader.h b/include/multipass/url_downloader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Canonical, Ltd.
+ * Copyright (C) 2017-2019 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/daemon/custom_image_host.cpp b/src/daemon/custom_image_host.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Canonical, Ltd.
+ * Copyright (C) 2018-2019 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/network/url_downloader.cpp b/src/network/url_downloader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Canonical, Ltd.
+ * Copyright (C) 2017-2019 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/tests/stub_virtual_machine.h b/tests/stub_virtual_machine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Canonical, Ltd.
+ * Copyright (C) 2017-2019 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,24 +13,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Alberto Aguirre <[email protected]>
- *
  */
 
 #ifndef MULTIPASS_STUB_VIRTUAL_MACHINE_H
 #define MULTIPASS_STUB_VIRTUAL_MACHINE_H
 
 #include <multipass/virtual_machine.h>
 
-#include "stub_ssh_key_provider.h"
-
 namespace multipass
 {
 namespace test
 {
 struct StubVirtualMachine final : public multipass::VirtualMachine
 {
-    StubVirtualMachine() : VirtualMachine{StubSSHKeyProvider(), ""}
+    StubVirtualMachine() : VirtualMachine{nullptr, ""}
     {
     }
 

diff --git a/tests/test_libvirt_backend.cpp b/tests/test_libvirt_backend.cpp
@@ -70,7 +70,7 @@ struct LibVirtBackend : public Test
                                                       "",
                                                       {dummy_image.name(), "", "", "", "", "", "", {}},
                                                       dummy_cloud_init_iso.name(),
-                                                      key_provider};
+                                                      &key_provider};
     mpt::TempDir data_dir;
 
     decltype(MOCK(virConnectClose)) connect_close{MOCK(virConnectClose)};

diff --git a/tests/test_qemu_backend.cpp b/tests/test_qemu_backend.cpp
@@ -48,7 +48,7 @@ struct QemuBackend : public mpt::TestWithMockedBinPath
                                                       "",
                                                       {dummy_image.name(), "", "", "", "", "", "", {}},
                                                       dummy_cloud_init_iso.name(),
-                                                      key_provider};
+                                                      &key_provider};
     mpt::TempDir data_dir;
 };