wip: TestSlapgridUsageReport tests are passing

slapos/tests/test_slapgrid.py

@@ -478,6 +478,12 @@ class ComputerForTest(object):
                 "portal_type": "Software Instance",
                 "success": "Done"
               }, indent=2)
+            if "requested_instance_list" in content:
+              return json.dumps({
+                "reference": requested_instance.name,
+                "portal_type": "Software Instance",
+                "success": "Done"
+              }, indent=2)
           else:
             return json.dumps({
               "status": "404", 
@@ -2024,6 +2030,7 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase):
 
       computer.sequence = []
       instance.requested_state = 'destroyed'
+      self.grid.computer_partition_list = None
       self.assertEqual(self.grid.agregateAndSendUsage(), slapgrid.SLAPGRID_SUCCESS)
       # Assert partition directory is empty
       self.assertInstanceDirectoryListEqual(['0'])
@@ -2068,26 +2075,24 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase):
 
       # Then run usage report and see if it is still working
       computer.sequence = []
+      self.grid.computer_partition_list = None
       self.assertEqual(self.grid.agregateAndSendUsage(), slapgrid.SLAPGRID_SUCCESS)
-      # registerComputerPartition will create one more file: 
-      from slapos.slap.slap import COMPUTER_PARTITION_REQUEST_LIST_TEMPLATE_FILENAME
-      request_list_file = COMPUTER_PARTITION_REQUEST_LIST_TEMPLATE_FILENAME % instance.name
       self.assertInstanceDirectoryListEqual(['0'])
       six.assertCountEqual(self, os.listdir(instance.partition_path),
                             ['.slapgrid', '.0_wrapper.log', 'buildout.cfg',
                              'etc', 'software_release', 'worked',
-                             '.slapos-retention-lock-delay', request_list_file])
+                             '.slapos-retention-lock-delay'])
       wrapper_log = os.path.join(instance.partition_path, '.0_wrapper.log')
       self.assertLogContent(wrapper_log, 'Working')
       self.assertInstanceDirectoryListEqual(['0'])
       six.assertCountEqual(self, os.listdir(instance.partition_path),
                             ['.slapgrid', '.0_wrapper.log', 'buildout.cfg',
                              'etc', 'software_release', 'worked',
-                             '.slapos-retention-lock-delay', request_list_file])
+                             '.slapos-retention-lock-delay'])
       wrapper_log = os.path.join(instance.partition_path, '.0_wrapper.log')
       self.assertLogContent(wrapper_log, 'Working')
       self.assertEqual(computer.sequence,
-                       ['/api/allDocs'])
+                       ['/api/allDocs/'])
       self.assertEqual('started', instance.state)
 
   def test_slapgrid_instance_ignore_free_instance(self):
@@ -2107,7 +2112,7 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase):
       self.assertInstanceDirectoryListEqual(['0'])
       six.assertCountEqual(self, os.listdir(instance.partition_path), [])
       six.assertCountEqual(self, os.listdir(self.software_root), [instance.software.software_hash])
-      self.assertEqual(computer.sequence, ['/getFullComputerInformation'])
+      self.assertEqual(computer.sequence, ['/api/allDocs/'])
 
   def test_slapgrid_report_ignore_free_instance(self):
     """
@@ -2126,7 +2131,7 @@ class TestSlapgridUsageReport(MasterMixin, unittest.TestCase):
       self.assertInstanceDirectoryListEqual(['0'])
       six.assertCountEqual(self, os.listdir(instance.partition_path), [])
       six.assertCountEqual(self, os.listdir(self.software_root), [instance.software.software_hash])
-      self.assertEqual(computer.sequence, ['/getFullComputerInformation'])
+      self.assertEqual(computer.sequence, ['/api/allDocs/'])
 
 
 class TestSlapgridSoftwareReleaseSlapTool(SlapToolMasterMixin, unittest.TestCase):