Remove unnecessary vmname testing code

tests/base.py

@@ -105,11 +105,9 @@ def _fileExists(self, remote_path):
 
         return True
 
-    def logging_configured(self, vmname=False):
+    def logging_configured(self):
         """
         Make sure rsyslog is configured to send in data to sd-log vm.
-        Takes an optional 'vmname' argument, in case hostname
-        returned by system is an insufficient identifier, e.g. Whonix.
         """
         self.assertTrue(self._package_is_installed("securedrop-log"))
         self.assertTrue(self._fileExists("/usr/sbin/sd-rsyslog"))
@@ -120,10 +118,6 @@ def logging_configured(self, vmname=False):
         static_content = """[sd-rsyslog]
 remotevm = sd-log
 """
-        # A hardcoded vmname should only be present if required,
-        # since securedrop-log will default to value of `hostname`.
-        if vmname:
-            static_content += "localvm = {}\n".format(self.vm_name)
         self.assertEqual(file_content, static_content)
         # Check for evidence of misconfigured logging in syslog,
         # fail if matching events found

tests/test_sd_whonix.py

@@ -54,9 +54,6 @@ def test_sd_whonix_repo_enabled(self):
         """
         assert self._fileExists(self.whonix_apt_list)
 
-    def test_logging_configured(self):
-        self.logging_configured(vmname=True)
-
     def test_sd_whonix_verify_tor_config(self):
         # User must be debian-tor for v3 Onion, due to restrictive
         # mode on the client keys directory.