Merge pull request ceph#1736 from ceph/wip-7500-wusui

Fix s3 tests in the rgw workunit. Reviewed-by: Yehuda Sadeh <[email protected]>
devicenull · Apr 28, 2014 · 5544a51 · 5544a51
2 parents a60e15a + 9e3b860
commit 5544a51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/qa/workunits/rgw/s3_bucket_quota.pl b/qa/workunits/rgw/s3_bucket_quota.pl
@@ -53,7 +53,8 @@ =head1 ARGUMENTS
 my $s3;
 my $domain   = "front.sepia.ceph.com";
 my $host     = get_hostname();
-our $hostname = "$host.$domain:7280"; # as rgw is running on port 7280
+my $port     = $ENV{RGW_PORT}||7280;
+our $hostname = "$host.$domain:$port";
 our $testfileloc;
 my $rgw_user = "qa_user";
 

diff --git a/qa/workunits/rgw/s3_multipart_upload.pl b/qa/workunits/rgw/s3_multipart_upload.pl
@@ -48,7 +48,8 @@ =head1 ARGUMENTS
 my $s3;
 my $domain   = "front.sepia.ceph.com";
 my $host     = get_hostname();
-our $hostname = "$host.$domain:7280";
+my $port     = $ENV{RGW_PORT}||7280;
+our $hostname = "$host.$domain:$port";
 our $testfileloc;
 our $mytestfilename;
 

diff --git a/qa/workunits/rgw/s3_user_quota.pl b/qa/workunits/rgw/s3_user_quota.pl
@@ -52,7 +52,8 @@ =head1 ARGUMENTS
 my $s3;
 my $domain   = "front.sepia.ceph.com";
 my $host     = get_hostname();
-our $hostname = "$host.$domain:7280";
+my $port     = $ENV{RGW_PORT}||7280;
+our $hostname = "$host.$domain:$port";
 our $testfileloc;
 our $cnt;