change setA/setB labels if viewing actuals vs expectations

gm/rebaseline_server/compare_rendered_pictures_test.py

Index: gm/rebaseline_server/compare_rendered_pictures_test.py
diff --git a/gm/rebaseline_server/compare_rendered_pictures_test.py b/gm/rebaseline_server/compare_rendered_pictures_test.py
index e761c8a5c2dd37defaa8855e1eed75b8f0892606..6a057d29429c76967cf0d1e8744b4588fb7ad2f4 100755
--- a/gm/rebaseline_server/compare_rendered_pictures_test.py
+++ b/gm/rebaseline_server/compare_rendered_pictures_test.py
@@ -40,30 +40,29 @@ class CompareRenderedPicturesTest(base_unittest.TestCase):
   def test_endToEnd(self):
     """Generate two sets of SKPs, run render_pictures over both, and compare
     the results."""
-    setA_label = 'before_patch'
-    setB_label = 'after_patch'
+    setA_subdir = 'before_patch'
+    setB_subdir = 'after_patch'
     self._generate_skps_and_run_render_pictures(
-        subdir=setA_label, skpdict={
+        subdir=setA_subdir, skpdict={
             'changed.skp': 200,
             'unchanged.skp': 100,
             'only-in-before.skp': 128,
         })
     self._generate_skps_and_run_render_pictures(
-        subdir=setB_label, skpdict={
+        subdir=setB_subdir, skpdict={
             'changed.skp': 201,
             'unchanged.skp': 100,
             'only-in-after.skp': 128,
         })
 
     results_obj = compare_rendered_pictures.RenderedPicturesComparisons(
-        setA_dirs=[os.path.join(self.temp_dir, setA_label)],
-        setB_dirs=[os.path.join(self.temp_dir, setB_label)],
+        setA_dirs=[os.path.join(self.temp_dir, setA_subdir)],
+        setB_dirs=[os.path.join(self.temp_dir, setB_subdir)],
         setA_section=gm_json.JSONKEY_ACTUALRESULTS,
         setB_section=gm_json.JSONKEY_ACTUALRESULTS,
         image_diff_db=imagediffdb.ImageDiffDB(self.temp_dir),
         image_base_gs_url='gs://fakebucket/fake/path',
-        diff_base_url='/static/generated-images',
-        setA_label=setA_label, setB_label=setB_label)
+        diff_base_url='/static/generated-images')
     results_obj.get_timestamp = mock_get_timestamp
 
     gm_json.WriteToFile(
@@ -81,8 +80,7 @@ class CompareRenderedPicturesTest(base_unittest.TestCase):
         setB_section=gm_json.JSONKEY_ACTUALRESULTS,
         image_diff_db=imagediffdb.ImageDiffDB(self.temp_dir),
         image_base_gs_url='gs://fakebucket/fake/path',
-        diff_base_url='/static/generated-images',
-        setA_label='setA', setB_label='setB')
+        diff_base_url='/static/generated-images')
     results_obj.get_timestamp = mock_get_timestamp
 
     gm_json.WriteToFile(