9b5f1e2ef7c4e9636a3dc8d68c8780f7f979f271 chmalee Tue Feb 7 16:13:17 2023 -0800 Let api tests use an environment variable for which server to use so we can verify our sandbox versions of the cgi function, refs Hiram email diff --git src/hg/hubApi/tests/jsonConsumer.pl src/hg/hubApi/tests/jsonConsumer.pl index 0c5c0af..b3c8169 100755 --- src/hg/hubApi/tests/jsonConsumer.pl +++ src/hg/hubApi/tests/jsonConsumer.pl @@ -3,40 +3,40 @@ use strict; use warnings; use HTTP::Tiny; use Time::HiRes; use JSON; use Getopt::Long; # forward declaration sub performRestAction($$$); my $http = HTTP::Tiny->new(); # my $server = 'https://api.genome.ucsc.edu'; # my $server = 'https://apibeta.soe.ucsc.edu'; # api-test is actually hgwdev.gi.ucsc.edu == genome-test.gi.ucsc.edu # using /usr/local/apache/cgi-bin/hubApi -my $server = 'https://api-test.gi.ucsc.edu'; # hgwdev-api is using /usr/local/apache/cgi-bin-api/hubApi # my $server = 'https://hgwdev-api.gi.ucsc.edu'; my $globalHeaders = { 'Content-Type' => 'application/json' }; my $lastRequestTime = Time::HiRes::time(); my $processStartTime = Time::HiRes::time(); my $requestCount = 0; ############################################################################## # command line options +my $server = 'https://api-test.gi.ucsc.edu'; # defaults to api-test but can be set via "binary" command line arg my $endpoint = ""; my $hubUrl = ""; my $genome = ""; my $track = ""; my $chrom = ""; my $start = ""; my $end = ""; my $test0 = 0; my $trackDump = 0; my $debug = 0; my $trackLeavesOnly = 0; my $measureTiming = 0; my $jsonOutputArrays = 0; my $maxItemsOutput = ""; ############################################################################## @@ -451,31 +451,32 @@ my $argc = scalar(@ARGV); GetOptions ("hubUrl=s" => \$hubUrl, "endpoint=s" => \$endpoint, "genome=s" => \$genome, "track=s" => \$track, "chrom=s" => \$chrom, "start=s" => \$start, "end=s" => \$end, "test0" => \$test0, "trackDump" => \$trackDump, "debug" => \$debug, "trackLeavesOnly" => \$trackLeavesOnly, "measureTiming" => \$measureTiming, "jsonOutputArrays" => \$jsonOutputArrays, - "maxItemsOutput=s" => \$maxItemsOutput) + "maxItemsOutput=s" => \$maxItemsOutput, + "serverName=s" => \$server) or die "Error in command line arguments\n"; if ($test0) { test0; elapsedTime(); exit 0; } if ($argc > 0) { if (processEndPoint()) { elapsedTime(); exit 255; } else { elapsedTime(); exit 0;