Update expected tests on pyimport

Summary: Amongst the other failures D90224863 had a failure due to a new test being added. We should just auto-update the tests on import.

Reviewed By: itamaro

Differential Revision: D90268060

fbshipit-source-id: 8dc365cc26dbe31abf29f7124c6259749d2171d4

Author: DinoV

cinderx/TestScripts/gen_test_defs.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Generate what should be the current contents of the tests.bzl file and write
+# it out to $1.
+
+set -e
+
+if [ -z "$1" ]; then echo "Usage: $0 <output_file>"; exit 1; fi
+
+echo Generate 3.10
+buck run fbcode//cinderx:ctl3.10 > /tmp/3.10.txt
+echo Generate 3.12
+buck run fbcode//cinderx:ctl3.12 > /tmp/3.12.txt
+echo Generate 3.14
+buck run fbcode//cinderx:ctl3.14 > /tmp/3.14.txt
+echo Generate 3.15
+buck run fbcode//cinderx:ctl3.15 > /tmp/3.15.txt
+
+{
+    echo "TESTS = {"
+    echo \"3.10\":
+    cat /tmp/3.10.txt
+    echo ","
+    echo \"3.12\":
+    cat /tmp/3.12.txt
+    echo ","
+    echo \"3.14\":
+    cat /tmp/3.14.txt
+    echo ","
+    echo \"3.15\":
+    cat /tmp/3.15.txt
+    echo "}"
+} > "$1"
+pyfmt "$1"

cinderx/TestScripts/regen_test_defs.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Verify that the tests.bzl file is up to date and accounts for all of the CPython and cinder tests.
+# If the tests diff you can re-run this and cp /tmp/tests.txt to cinderx/tests.bzl
+
+set -e
+
+cd "$(dirname "$(readlink -f "$0")")"
+
+./gen_test_defs.sh "$(pwd)/../tests.bzl"

cinderx/TestScripts/test_test_defs.sh

@@ -1,36 +1,12 @@
 #!/bin/bash
 
 # Verify that the tests.bzl file is up to date and accounts for all of the CPython and cinder tests.
-# If the tests diff you can re-run this and cp /tmp/tests.txt to cinderx/tests.bzl
+# If the tests diff you can run regen_test_defs.sh to update it.
 
 set -e
 
-cd "$(dirname "$(readlink -f "$0")")"/../
+cd "$(dirname "$(readlink -f "$0")")"
 
-echo Generate 3.10
-buck run fbcode//cinderx:ctl3.10 > /tmp/3.10.txt
-echo Generate 3.12
-buck run fbcode//cinderx:ctl3.12 > /tmp/3.12.txt
-echo Generate 3.14
-buck run fbcode//cinderx:ctl3.14 > /tmp/3.14.txt
-echo Generate 3.15
-buck run fbcode//cinderx:ctl3.15 > /tmp/3.15.txt
+./gen_test_defs.sh /tmp/tests.txt
 
-{
-    echo "TESTS = {"
-    echo \"3.10\":
-    cat /tmp/3.10.txt
-    echo ","
-    echo \"3.12\":
-    cat /tmp/3.12.txt
-    echo ","
-    echo \"3.14\":
-    cat /tmp/3.14.txt
-    echo ","
-    echo \"3.15\":
-    cat /tmp/3.15.txt
-    echo "}"
-} > /tmp/tests.txt
-pyfmt /tmp/tests.txt
-
-diff /tmp/tests.txt tests.bzl
+diff /tmp/tests.txt ../tests.bzl