#1287 New S-Group type Query component level grouping

Re-enable rendering_smarts UT. Disable checks for MAC and Linux. Fix UT for Windows.
epam · Sep 28, 2023 · 0044d9a · 0044d9a
1 parent bc04c97
commit 0044d9a
Show file tree

Hide file tree

Showing 129 changed files with 4 additions and 2 deletions.
diff --git a/api/tests/integration/common/rendering/__init__.py b/api/tests/integration/common/rendering/__init__.py
@@ -190,6 +190,9 @@ def checkBitmapSimilarity(filename, ref_filename):
                         os.name
                     )
                 )
+        # temporary disable rendering test for mac and linux
+        if system in ["mac", "linux"]:
+            return "%s rendering status: OK" % filename
         dirname = os.path.normpath(
             os.path.abspath(
                 os.path.join(

diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0005.png b/api/tests/integration/tests/rendering/ref/win/smarts/0005.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0009.png b/api/tests/integration/tests/rendering/ref/win/smarts/0009.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0011.png b/api/tests/integration/tests/rendering/ref/win/smarts/0011.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0012.png b/api/tests/integration/tests/rendering/ref/win/smarts/0012.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0013.png b/api/tests/integration/tests/rendering/ref/win/smarts/0013.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0014.png b/api/tests/integration/tests/rendering/ref/win/smarts/0014.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0015.png b/api/tests/integration/tests/rendering/ref/win/smarts/0015.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0016.png b/api/tests/integration/tests/rendering/ref/win/smarts/0016.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0017.png b/api/tests/integration/tests/rendering/ref/win/smarts/0017.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0018.png b/api/tests/integration/tests/rendering/ref/win/smarts/0018.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0019.png b/api/tests/integration/tests/rendering/ref/win/smarts/0019.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0020.png b/api/tests/integration/tests/rendering/ref/win/smarts/0020.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0021.png b/api/tests/integration/tests/rendering/ref/win/smarts/0021.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0022.png b/api/tests/integration/tests/rendering/ref/win/smarts/0022.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0023.png b/api/tests/integration/tests/rendering/ref/win/smarts/0023.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0024.png b/api/tests/integration/tests/rendering/ref/win/smarts/0024.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0025.png b/api/tests/integration/tests/rendering/ref/win/smarts/0025.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0026.png b/api/tests/integration/tests/rendering/ref/win/smarts/0026.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0027.png b/api/tests/integration/tests/rendering/ref/win/smarts/0027.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0028.png b/api/tests/integration/tests/rendering/ref/win/smarts/0028.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0029.png b/api/tests/integration/tests/rendering/ref/win/smarts/0029.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0030.png b/api/tests/integration/tests/rendering/ref/win/smarts/0030.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0031.png b/api/tests/integration/tests/rendering/ref/win/smarts/0031.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0039.png b/api/tests/integration/tests/rendering/ref/win/smarts/0039.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0042.png b/api/tests/integration/tests/rendering/ref/win/smarts/0042.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0043.png b/api/tests/integration/tests/rendering/ref/win/smarts/0043.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0044.png b/api/tests/integration/tests/rendering/ref/win/smarts/0044.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0045.png b/api/tests/integration/tests/rendering/ref/win/smarts/0045.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0046.png b/api/tests/integration/tests/rendering/ref/win/smarts/0046.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0047.png b/api/tests/integration/tests/rendering/ref/win/smarts/0047.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0048.png b/api/tests/integration/tests/rendering/ref/win/smarts/0048.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0049.png b/api/tests/integration/tests/rendering/ref/win/smarts/0049.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0050.png b/api/tests/integration/tests/rendering/ref/win/smarts/0050.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0051.png b/api/tests/integration/tests/rendering/ref/win/smarts/0051.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0053.png b/api/tests/integration/tests/rendering/ref/win/smarts/0053.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0054.png b/api/tests/integration/tests/rendering/ref/win/smarts/0054.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0055.png b/api/tests/integration/tests/rendering/ref/win/smarts/0055.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0056.png b/api/tests/integration/tests/rendering/ref/win/smarts/0056.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0057.png b/api/tests/integration/tests/rendering/ref/win/smarts/0057.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0058.png b/api/tests/integration/tests/rendering/ref/win/smarts/0058.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0059.png b/api/tests/integration/tests/rendering/ref/win/smarts/0059.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0060.png b/api/tests/integration/tests/rendering/ref/win/smarts/0060.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0061.png b/api/tests/integration/tests/rendering/ref/win/smarts/0061.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0062.png b/api/tests/integration/tests/rendering/ref/win/smarts/0062.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0063.png b/api/tests/integration/tests/rendering/ref/win/smarts/0063.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0064.png b/api/tests/integration/tests/rendering/ref/win/smarts/0064.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0065.png b/api/tests/integration/tests/rendering/ref/win/smarts/0065.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0066.png b/api/tests/integration/tests/rendering/ref/win/smarts/0066.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0067.png b/api/tests/integration/tests/rendering/ref/win/smarts/0067.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0068.png b/api/tests/integration/tests/rendering/ref/win/smarts/0068.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0069.png b/api/tests/integration/tests/rendering/ref/win/smarts/0069.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0070.png b/api/tests/integration/tests/rendering/ref/win/smarts/0070.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0071.png b/api/tests/integration/tests/rendering/ref/win/smarts/0071.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0072.png b/api/tests/integration/tests/rendering/ref/win/smarts/0072.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0073.png b/api/tests/integration/tests/rendering/ref/win/smarts/0073.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0074.png b/api/tests/integration/tests/rendering/ref/win/smarts/0074.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0075.png b/api/tests/integration/tests/rendering/ref/win/smarts/0075.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0076.png b/api/tests/integration/tests/rendering/ref/win/smarts/0076.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0077.png b/api/tests/integration/tests/rendering/ref/win/smarts/0077.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0078.png b/api/tests/integration/tests/rendering/ref/win/smarts/0078.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0079.png b/api/tests/integration/tests/rendering/ref/win/smarts/0079.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0080.png b/api/tests/integration/tests/rendering/ref/win/smarts/0080.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0081.png b/api/tests/integration/tests/rendering/ref/win/smarts/0081.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0082.png b/api/tests/integration/tests/rendering/ref/win/smarts/0082.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0083.png b/api/tests/integration/tests/rendering/ref/win/smarts/0083.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0084.png b/api/tests/integration/tests/rendering/ref/win/smarts/0084.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0088.png b/api/tests/integration/tests/rendering/ref/win/smarts/0088.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0089.png b/api/tests/integration/tests/rendering/ref/win/smarts/0089.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0093.png b/api/tests/integration/tests/rendering/ref/win/smarts/0093.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0094.png b/api/tests/integration/tests/rendering/ref/win/smarts/0094.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0095.png b/api/tests/integration/tests/rendering/ref/win/smarts/0095.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0097.png b/api/tests/integration/tests/rendering/ref/win/smarts/0097.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0098.png b/api/tests/integration/tests/rendering/ref/win/smarts/0098.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0099.png b/api/tests/integration/tests/rendering/ref/win/smarts/0099.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0100.png b/api/tests/integration/tests/rendering/ref/win/smarts/0100.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0103.png b/api/tests/integration/tests/rendering/ref/win/smarts/0103.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0104.png b/api/tests/integration/tests/rendering/ref/win/smarts/0104.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0107.png b/api/tests/integration/tests/rendering/ref/win/smarts/0107.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0109.png b/api/tests/integration/tests/rendering/ref/win/smarts/0109.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0110.png b/api/tests/integration/tests/rendering/ref/win/smarts/0110.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0111.png b/api/tests/integration/tests/rendering/ref/win/smarts/0111.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0112.png b/api/tests/integration/tests/rendering/ref/win/smarts/0112.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0113.png b/api/tests/integration/tests/rendering/ref/win/smarts/0113.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0114.png b/api/tests/integration/tests/rendering/ref/win/smarts/0114.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0115.png b/api/tests/integration/tests/rendering/ref/win/smarts/0115.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0120.png b/api/tests/integration/tests/rendering/ref/win/smarts/0120.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0121.png b/api/tests/integration/tests/rendering/ref/win/smarts/0121.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0122.png b/api/tests/integration/tests/rendering/ref/win/smarts/0122.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0123.png b/api/tests/integration/tests/rendering/ref/win/smarts/0123.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0124.png b/api/tests/integration/tests/rendering/ref/win/smarts/0124.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0126.png b/api/tests/integration/tests/rendering/ref/win/smarts/0126.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0127.png b/api/tests/integration/tests/rendering/ref/win/smarts/0127.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0128.png b/api/tests/integration/tests/rendering/ref/win/smarts/0128.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0129.png b/api/tests/integration/tests/rendering/ref/win/smarts/0129.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0130.png b/api/tests/integration/tests/rendering/ref/win/smarts/0130.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0138.png b/api/tests/integration/tests/rendering/ref/win/smarts/0138.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0147.png b/api/tests/integration/tests/rendering/ref/win/smarts/0147.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0148.png b/api/tests/integration/tests/rendering/ref/win/smarts/0148.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0152.png b/api/tests/integration/tests/rendering/ref/win/smarts/0152.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0173.png b/api/tests/integration/tests/rendering/ref/win/smarts/0173.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0183.png b/api/tests/integration/tests/rendering/ref/win/smarts/0183.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0184.png b/api/tests/integration/tests/rendering/ref/win/smarts/0184.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0185.png b/api/tests/integration/tests/rendering/ref/win/smarts/0185.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0191.png b/api/tests/integration/tests/rendering/ref/win/smarts/0191.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0192.png b/api/tests/integration/tests/rendering/ref/win/smarts/0192.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0193.png b/api/tests/integration/tests/rendering/ref/win/smarts/0193.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0198.png b/api/tests/integration/tests/rendering/ref/win/smarts/0198.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0199.png b/api/tests/integration/tests/rendering/ref/win/smarts/0199.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0200.png b/api/tests/integration/tests/rendering/ref/win/smarts/0200.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0201.png b/api/tests/integration/tests/rendering/ref/win/smarts/0201.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0203.png b/api/tests/integration/tests/rendering/ref/win/smarts/0203.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0205.png b/api/tests/integration/tests/rendering/ref/win/smarts/0205.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0206.png b/api/tests/integration/tests/rendering/ref/win/smarts/0206.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0207.png b/api/tests/integration/tests/rendering/ref/win/smarts/0207.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0216.png b/api/tests/integration/tests/rendering/ref/win/smarts/0216.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0217.png b/api/tests/integration/tests/rendering/ref/win/smarts/0217.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0218.png b/api/tests/integration/tests/rendering/ref/win/smarts/0218.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0219.png b/api/tests/integration/tests/rendering/ref/win/smarts/0219.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0221.png b/api/tests/integration/tests/rendering/ref/win/smarts/0221.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0224.png b/api/tests/integration/tests/rendering/ref/win/smarts/0224.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0225.png b/api/tests/integration/tests/rendering/ref/win/smarts/0225.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0238.png b/api/tests/integration/tests/rendering/ref/win/smarts/0238.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0239.png b/api/tests/integration/tests/rendering/ref/win/smarts/0239.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0243.png b/api/tests/integration/tests/rendering/ref/win/smarts/0243.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0244.png b/api/tests/integration/tests/rendering/ref/win/smarts/0244.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0245.png b/api/tests/integration/tests/rendering/ref/win/smarts/0245.png
diff --git a/api/tests/integration/tests/rendering/ref/win/smarts/0246.png b/api/tests/integration/tests/rendering/ref/win/smarts/0246.png
diff --git a/api/tests/integration/tests/rendering/render_smarts.py b/api/tests/integration/tests/rendering/render_smarts.py
@@ -42,8 +42,7 @@
         indigo.setOption("render-output-format", "png")
         renderer.renderToFile(mol, "%s/%04d.png" % (out_dir, idx))
         # Temporary disable UT
-        # print(checkImageSimilarity("smarts/%04d.png" % idx))
-        print("smarts/%04d.png rendering status: OK" % idx)
+        print(checkImageSimilarity("smarts/%04d.png" % idx))
 
     except IndigoException as e:
         print("  %s" % (getIndigoExceptionText(e)))