ovsdb-cluster.at: Remove extra ordinal schema and schema name operati…

…ons. Many tests are retrieving the schema name twice and also producing an ordinal schema which is not used in these tests. Acked-by: Simon Horman <[email protected]> Signed-off-by: Ilya Maximets <[email protected]>
ovsrobot · Sep 8, 2023 · 563c50f · 563c50f
1 parent 154e429
commit 563c50f
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/tests/ovsdb-cluster.at b/tests/ovsdb-cluster.at
@@ -104,8 +104,6 @@ ovsdb_test_cluster_disconnect () {
     n=$1
     leader_or_follower=$2
     check_flapping=$3
-    schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-    ordinal_schema > schema
     AT_CHECK([ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft], [0], [], [stderr])
     cid=`ovsdb-tool db-cid s1.db`
     schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
@@ -221,8 +219,6 @@ AT_SETUP([OVSDB cluster - initial status should be disconnected])
 AT_KEYWORDS([ovsdb server negative unix cluster disconnect])
 
 n=3
-schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-ordinal_schema > schema
 AT_CHECK([ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft], [0], [], [stderr])
 cid=`ovsdb-tool db-cid s1.db`
 schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
@@ -260,8 +256,6 @@ AT_SETUP([OVSDB cluster - election timer change])
 AT_KEYWORDS([ovsdb server positive unix cluster timer])
 
 n=3
-schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-ordinal_schema > schema
 AT_CHECK([ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft], [0], [], [stderr])
 cid=`ovsdb-tool db-cid s1.db`
 schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
@@ -353,8 +347,6 @@ AT_SETUP([OVSDB cluster - install snapshot RPC])
 AT_KEYWORDS([ovsdb server positive unix cluster snapshot])
 
 n=3
-schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-ordinal_schema > schema
 AT_CHECK([ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft], [0], [], [stderr])
 cid=`ovsdb-tool db-cid s1.db`
 schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
@@ -433,8 +425,6 @@ AT_SETUP([OVSDB cluster - follower crash while joining])
 AT_KEYWORDS([ovsdb server negative unix cluster join])
 
 n=3
-schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-ordinal_schema > schema
 AT_CHECK([ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db dnl
               $abs_srcdir/idltest.ovsschema unix:s1.raft], [0], [], [stderr])
 cid=`ovsdb-tool db-cid s1.db`
@@ -665,8 +655,6 @@ AT_SETUP([OVSDB cluster - competing candidates])
 AT_KEYWORDS([ovsdb server negative unix cluster competing-candidates])
 
 n=3
-schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-ordinal_schema > schema
 AT_CHECK([ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft], [0], [], [stderr])
 cid=`ovsdb-tool db-cid s1.db`
 schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`