Bug fix: Update tests as the default amount of memory was increased to 2048M

Commit 2ca1067 increased the default amount of memory to 2048MB.
Update the test accordingly.

Signed-off-by: Aline Manera <[email protected]>

Author: alinefm

tests/test_template.py

@@ -278,12 +278,8 @@ def test_customized_tmpl(self):
         self.assertEqual(update_tmpl['cpu_info'], cpu_info_data['cpu_info'])
 
         # Test memory and max memory
-        # - memory greated than max memory (1024 default on x86
-        # otherwise 2048)
-        if os.uname()[4] == 's390x':
-            req = json.dumps({'memory': {'current': 4096}})
-        else:
-            req = json.dumps({'memory': {'current': 2048}})
+        # - memory greated than max memory
+        req = json.dumps({'memory': {'current': 4096}})
         resp = self.request(new_tmpl_uri, req, 'PUT')
         self.assertEqual(400, resp.status)
         # - max memory greater than limit: 16TiB to PPC and 4TiB to x86

tests/test_vmtemplate.py

@@ -138,10 +138,7 @@ def test_to_xml(self):
         # max memory tag is not set
         self.assertEqual(0, len(xpath_get_text(xml, expr)))
         expr = '/domain/memory'
-        if os.uname()[4] == 's390x':
-            self.assertEqual(str(2048), xpath_get_text(xml, expr)[0])
-        else:
-            self.assertEqual(str(1024), xpath_get_text(xml, expr)[0])
+        self.assertEqual(str(2048), xpath_get_text(xml, expr)[0])
 
         if hasattr(psutil, 'virtual_memory'):
             host_memory = psutil.virtual_memory().total >> 10