Merge lp:~tribaal/landscape-client/isolate-lxc-container-tests into lp:~landscape/landscape-client/trunk

[Chris Glass]

This fixes the related bug - I added some mocking to make sure we enforce the "container status" part of the registration message to be "", in case the test suite is run inside an LXC container.

[Björn Tillenius (bjornt)]

I think this adds too much noise to the tests. The tests aren't meant to test the
exact contents of the message, they mostly test that a registration message
was sent. I would suggest changing the tests to check parts of the message only.

[Chris Glass (tribaal)]

You are right, I'll refactor instead.

Unmerged revisions

740. By Chris Glass on 2013-10-22

Added some mocking to the tests for container detection, since in case the test
suite is run inside a container the tests would fail.

=== modified file 'landscape/broker/tests/test_registration.py'
--- landscape/broker/tests/test_registration.py	2013-10-09 08:19:14 +0000
+++ landscape/broker/tests/test_registration.py	2013-10-22 23:13:38 +0000
@@ -158,6 +158,11 @@
         secure_id is set, and an exchange is about to happen,
         queue a registration message.
         """
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
         self.mstore.set_accepted_types(["register"])
         self.config.computer_title = "Computer Title"
         self.config.account_name = "account_name"
@@ -181,10 +186,16 @@
         secure_id is set, and an exchange is about to happen,
         queue a registration message with VM information.
         """
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+
         get_vm_info_mock = self.mocker.replace(get_vm_info)
         get_vm_info_mock()
         self.mocker.result("vmware")
         self.mocker.replay()
+
         self.mstore.set_accepted_types(["register"])
         self.config.computer_title = "Computer Title"
         self.config.account_name = "account_name"
@@ -198,6 +209,7 @@
                               "tags": None,
                               "vm-info": u"vmware",
                               "container-info": ""}])
+
         self.assertEqual(self.logfile.getvalue().strip(),
                          "INFO: Queueing message to register with account "
                          "'account_name' without a password.")
@@ -229,6 +241,11 @@
 
     def test_queue_message_on_exchange_with_password(self):
         """If a registration password is available, we pass it on!"""
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
         self.mstore.set_accepted_types(["register"])
         self.config.computer_title = "Computer Title"
         self.config.account_name = "account_name"
@@ -252,6 +269,11 @@
         If the admin has defined tags for this computer, we send them to the
         server.
         """
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
         self.mstore.set_accepted_types(["register"])
         self.config.computer_title = "Computer Title"
         self.config.account_name = "account_name"
@@ -277,6 +299,12 @@
         If the admin has defined tags for this computer, but they are not
         valid, we drop them, and report an error.
         """
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
+
         self.log_helper.ignore_errors("Invalid tags provided for cloud "
                                       "registration")
         self.mstore.set_accepted_types(["register"])
@@ -305,6 +333,12 @@
         If the admin has defined tags for this computer, we send them to the
         server.
         """
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
+
         self.mstore.set_accepted_types(["register"])
         self.config.computer_title = "Computer Title"
         self.config.account_name = "account_name"
@@ -501,6 +535,12 @@
         self.reactor.fire("exchange-done")
 
     def test_default_hostname(self):
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
+
         self.mstore.set_accepted_types(["register"])
         self.config.computer_title = "Computer Title"
         self.config.account_name = "account_name"
@@ -529,6 +569,12 @@
         When Juju information is found in $data_dir/juju-info.json,
         key parts of it are sent in the registration message.
         """
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
+
         self.mstore.set_accepted_types(["register"])
         self.config.account_name = "account_name"
         self.reactor.fire("run")
@@ -957,6 +1003,12 @@
         If fetching metadata fails, but we do have an account name, then we
         fall back to normal 'register' registration.
         """
+        get_container_info_mock = self.mocker.replace(
+            "landscape.lib.vm_info.get_container_info")
+        get_container_info_mock()
+        self.mocker.result("")
+        self.mocker.replay()
+
         self.mstore.set_accepted_types(["register"])
         self.log_helper.ignore_errors(HTTPCodeError)
         self.prepare_query_results(