remove useless commands from testscript tests

keygen-sh · Sep 26, 2024 · cc2c05b · cc2c05b
1 parent be08c3a
commit cc2c05b
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 52 deletions.
diff --git a/testdata/claim_conflict.txt b/testdata/claim_conflict.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
@@ -21,5 +18,5 @@ stdout '201'
 exec curl -s -o /dev/null -w "%{http_code}" -X PUT http://localhost:$PORT/v1/nodes/test_fingerprint
 stdout '409'
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/claim_license_conflict.txt b/testdata/claim_license_conflict.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
@@ -25,5 +22,5 @@ stdout '409'
 
 exec grep '{"error":"License claim conflict, heartbeat disabled"}' response.txt
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/claim_license_extended.txt b/testdata/claim_license_extended.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
@@ -25,5 +22,5 @@ stdout '202'
 exec grep '"license_file":' response.txt
 exec grep '"license_key":' response.txt
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/claim_license_lifo_strategy.txt b/testdata/claim_license_lifo_strategy.txt
@@ -1,12 +1,12 @@
-# Remove existing database
-rm -f relay.sqlite
 
-# Add two licenses
+
+# Add the first license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
 # Give a pause between adding licenses
 exec sleep 1
 
+# Add the second license
 exec relay add --file license_2.lic --key 9A96B8-FD08CD-8C433B-7657C8-8A8655-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
 # Set a port and strategy as environment variables
@@ -22,11 +22,12 @@ exec sleep 1
 # Claim a license (LIFO: should return the last license)
 exec curl -s -o response.txt -w "%{http_code}" -X PUT http://localhost:$PORT/v1/nodes/test_fingerprint
 
+# List all licenses for verifying
 exec relay ls --plain
 
 # Expect the first license to be returned
 exec grep '"license_file":' response.txt
 exec grep '"license_key":"9A96B8-FD08CD-8C433B-7657C8-8A8655-V3"' response.txt
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/claim_license_success.txt b/testdata/claim_license_success.txt
@@ -1,5 +1,4 @@
-# Remove existing database
-rm -f relay.sqlite
+
 
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
@@ -23,5 +22,5 @@ stdout '201'
 exec grep '"license_file":' response.txt
 exec grep '"license_key":' response.txt
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/claim_no_licenses_available.txt b/testdata/claim_no_licenses_available.txt
@@ -1,5 +1,4 @@
-# Remove existing database
-rm -f relay.sqlite
+
 
 # Start the server without adding any licenses
 env PORT=8084
@@ -15,4 +14,5 @@ exec curl -s -o response.txt -w "%{http_code}" -X PUT http://localhost:$PORT/v1/
 stdout '410'
 exec grep 'No licenses available' response.txt
 
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/cmd_add.txt b/testdata/cmd_add.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 exec ls
 
 # Add the license

diff --git a/testdata/cmd_del.txt b/testdata/cmd_del.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 

diff --git a/testdata/cmd_serve.txt b/testdata/cmd_serve.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
@@ -25,8 +22,5 @@ exec curl -s -X DELETE http://localhost:$PORT/v1/nodes/test_fingerprint
 # Expect no content in the response
 stdout ''
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process
-
-# Wait for the server to terminate
-# wait server_process
diff --git a/testdata/cmd_stat.txt b/testdata/cmd_stat.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 

diff --git a/testdata/release_license_not_found.txt b/testdata/release_license_not_found.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Start the server
 env PORT=8086
 exec relay serve --port $PORT &server_process_test&
@@ -15,5 +12,5 @@ exec curl -s -o response.txt -w "%{http_code}" -X DELETE http://localhost:$PORT/
 stdout '404'
 exec grep '{"error":"Claim not found"}' response.txt
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/release_license_success.txt b/testdata/release_license_success.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add the license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
@@ -21,5 +18,5 @@ stdout '201'
 exec curl -s -o /dev/null -w "%{http_code}" -X DELETE http://localhost:$PORT/v1/nodes/test_fingerprint
 stdout '204'
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
diff --git a/testdata/server_database.txt b/testdata/server_database.txt
@@ -11,7 +11,7 @@ exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --
 exec test -f $DATABASE_PATH
 
 # Set a port as environment variable
-env PORT=8087
+env PORT=8091
 
 # Start the server with custom database path
 exec relay serve --port $PORT --database $DATABASE_PATH &server_process_test&
@@ -25,7 +25,7 @@ exec curl -s -o response.txt -w "%{http_code}" -X PUT http://localhost:$PORT/v1/
 # Expect a success response (status 201)
 stdout '201'
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test
 
 # Clean up the custom database

diff --git a/testdata/server_ttl.txt b/testdata/server_ttl.txt
@@ -1,6 +1,3 @@
-# Remove existing database
-rm -f relay.sqlite
-
 # Add a license
 exec relay add --file license.lic --key 9E32DD-D8CC22-771926-C2D834-C506DC-V3 --public-key e8601e48b69383ba520245fd07971e983d06d22c4257cfd82304601479cee788
 
@@ -23,7 +20,7 @@ stdout '201'
 # Claim the license again before TTL expires
 exec curl -s -o response_extend.txt -w "%{http_code}" -X PUT http://localhost:$PORT/v1/nodes/test_fingerprint
 
-# Expect a license extension (status 202 Accepted)
+# Expect a license extension (status 202)
 stdout '202'
 
 # Wait for the TTL to expire and cleanup interval to run
@@ -35,5 +32,5 @@ exec curl -s -o response_after_ttl.txt -w "%{http_code}" -X PUT http://localhost
 # The license should have expired, allowing another claim (status 201 Created)
 stdout '201'
 
-# Stop the server
+# Kill the process (stop the server)
 kill server_process_test