Fix obtaining of architecture in DecompilerTest.

After commit 871f39a, the architecture is
obtained from the config. However, the commit has forgotten to (1) lowercase
the architecture (the code expects architecture to be lowercased) and (2) fix
the mocking of architecture in tests.

This commit fixes several failing unit tests.

Author: s3rvac

regression_tests/tools/decompiler_test.py

@@ -250,8 +250,11 @@ def _decomp_arch(self):
         return self._get_arch_from_out_config()
 
     def _get_arch_from_out_config(self):
-        arch = self.out_config.json.get('architecture', {})
-        return arch.get('name')
+        arch = self.out_config.json.get('architecture', {}).get('name')
+        if arch is None:
+            return None
+
+        return arch.lower()
 
     def _run_compiled_output_file(self, input, timeout):
         """Runs the compiled output C file with the given input and timeout and

tests/tools/decompiler_test_tests.py

@@ -8,7 +8,6 @@
 from unittest import mock
 
 from regression_tests.parsers.config_parser import Config
-from regression_tests.parsers.fileinfo_output_parser import FileinfoOutput
 from regression_tests.test_settings import TestSettings
 from regression_tests.tools.decompiler import Decompiler
 from regression_tests.tools.decompiler_test import DecompilerTest
@@ -136,18 +135,12 @@ def scenario_out_c_is_fixed_for_arch_when_input_is_c(self, arch):
 
     def scenario_out_c_is_fixed_for_arch_when_input_is_binary(self, arch):
         self.test = self.create(TestSettings(input='file.exe'))
-        # For binary files, the architecture is obtained from fileinfo (writers
-        # of regression tests do not usually specify the architecture for
-        # binary files because such a specification is useless).
-        #
-        # We also test that the architecture is parsed properly.
-        self.decompiler.fileinfo_outputs = [
-            FileinfoOutput(
-                '\n...\nArchitecture: {} (some irrelevant arch info)\n...'.format(
-                    arch
-                )
-            )
-        ]
+        # For binary files, the architecture is obtained from the config
+        # (writers of regression tests do not usually specify the architecture
+        # for binary files because such a specification is useless).
+        self.decompiler.out_config.json = {
+            'architecture': {'name': arch},
+        }
 
         self._check_out_c_gets_fixed()