vm_run_skia_try/write_json_summary: run skpdiff within imagediffdb, not on its own

compute_engine_scripts/telemetry/telemetry_slave_scripts/write_json_summary_test.py

Index: compute_engine_scripts/telemetry/telemetry_slave_scripts/write_json_summary_test.py
diff --git a/compute_engine_scripts/telemetry/telemetry_slave_scripts/write_json_summary_test.py b/compute_engine_scripts/telemetry/telemetry_slave_scripts/write_json_summary_test.py
index 5ca6b411f42b59a671d6d10bb4402a14ffd67a12..08bad47f7b3f1b40dc10480aab47a2d2b30bd0b8 100644
--- a/compute_engine_scripts/telemetry/telemetry_slave_scripts/write_json_summary_test.py
+++ b/compute_engine_scripts/telemetry/telemetry_slave_scripts/write_json_summary_test.py
@@ -23,15 +23,14 @@ class TestWriteJsonSummary(unittest.TestCase):
     self._gm_json_path = os.path.join(self._test_json_dir, 'gm_json_mock.py')
     self._imagediffdb_path = os.path.join(self._test_json_dir,
                                           'imagediffdb_mock.py')
-    self._skpdiff_output_csv = os.path.join(self._test_json_dir, 'output.csv')
     self._actual_output_dir = tempfile.mkdtemp()
     self._actual_output_file_path = os.path.join(self._actual_output_dir,
                                                  self._output_file_name)
     self._gs_output_dir = 'gs://dummy-bucket/output-dir'
     self._gs_skp_dir = 'gs://dummy-bucket/skps'
     self._img_root = '/tmp/'
-    self._nopatch_img_dir_name = 'nopatch'
-    self._withpatch_img_dir_name = 'withpatch'
+    self._nopatch_images_base_url = 'file://fake/path/to/nopatch'
+    self._withpatch_images_base_url = 'file://fake/path/to/withpatch'
     self._slave_num = 1
 
   def tearDown(self):
@@ -41,16 +40,15 @@ class TestWriteJsonSummary(unittest.TestCase):
     write_json_summary.WriteJsonSummary(
         img_root=self._img_root,
         nopatch_json=os.path.join(self._test_json_dir, 'output1.json'),
-        nopatch_img_dir_name=self._nopatch_img_dir_name,
+        nopatch_images_base_url=self._nopatch_images_base_url,
         withpatch_json=os.path.join(self._test_json_dir, 'output2.json'),
-        withpatch_img_dir_name=self._withpatch_img_dir_name,
+        withpatch_images_base_url=self._withpatch_images_base_url,
         output_file_path=self._actual_output_file_path,
         gs_output_dir=self._gs_output_dir,
         gs_skp_dir=self._gs_skp_dir,
         slave_num=self._slave_num,
         gm_json_path=self._gm_json_path,
-        imagediffdb_path=self._imagediffdb_path,
-        skpdiff_output_csv=self._skpdiff_output_csv)
+        imagediffdb_path=self._imagediffdb_path)
 
     self.assertTrue(
         filecmp.cmp(os.path.join(self._test_json_dir, self._output_file_name),
@@ -60,20 +58,18 @@ class TestWriteJsonSummary(unittest.TestCase):
     write_json_summary.WriteJsonSummary(
         img_root=self._img_root,
         nopatch_json=os.path.join(self._test_json_dir, 'output1.json'),
-        nopatch_img_dir_name=self._nopatch_img_dir_name,
+        nopatch_images_base_url=self._nopatch_images_base_url,
         withpatch_json=os.path.join(self._test_json_dir, 'output1.json'),
-        withpatch_img_dir_name=self._withpatch_img_dir_name,
+        withpatch_images_base_url=self._withpatch_images_base_url,
         output_file_path=self._actual_output_file_path,
         gs_output_dir=self._gs_output_dir,
         gs_skp_dir=self._gs_skp_dir,
         slave_num=self._slave_num,
         gm_json_path=self._gm_json_path,
-        imagediffdb_path=self._imagediffdb_path,
-        skpdiff_output_csv=self._skpdiff_output_csv)
+        imagediffdb_path=self._imagediffdb_path)
 
     self.assertFalse(os.path.isfile(self._actual_output_file_path))
 
 
 if __name__ == '__main__':
   unittest.main()
-