Merge pull request #691 from anrao19/tfa_swift

mergify[bot] · web-flow · commit acc1f5a3eef5 · 2025-03-10T07:03:20.000Z
[TFA] swift command not found as it installed inside virtual environment
diff --git a/rgw/v2/tests/s3_swift/swift_stats.py b/rgw/v2/tests/s3_swift/swift_stats.py
@@ -66,12 +66,12 @@ def test_exec(config, ssh_con):
             {"obj": rgw, "resource": "put_container", "args": [container_name]}
         )
         if container is False:
-            raise TestExecError("Resource execution failed: container creation faield")
+            raise TestExecError("Resource execution failed: container creation failed")
 
     host, ip = utils.get_hostname_ip(ssh_con)
     port = utils.get_radosgw_port_no(ssh_con)
     hostname = str(ip) + ":" + str(port)
-    cmd = "swift -A http://{hostname}/auth/1.0 -U '{uid}' -K '{key}' stat".format(
+    cmd = "venv/bin/swift -A http://{hostname}/auth/1.0 -U '{uid}' -K '{key}' stat".format(
         hostname=hostname, uid=user_info["user_id"], key=user_info["key"]
     )
     swift_cmd = utils.exec_shell_cmd(cmd)

Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,12 @@ def test_exec(config, ssh_con):`
`66`	`66`	`{"obj": rgw, "resource": "put_container", "args": [container_name]}`
`67`	`67`	`)`
`68`	`68`	`if container is False:`
`69`		`- raise TestExecError("Resource execution failed: container creation faield")`
	`69`	`+ raise TestExecError("Resource execution failed: container creation failed")`
`70`	`70`
`71`	`71`	`host, ip = utils.get_hostname_ip(ssh_con)`
`72`	`72`	`port = utils.get_radosgw_port_no(ssh_con)`
`73`	`73`	`hostname = str(ip) + ":" + str(port)`
`74`		`- cmd = "swift -A http://{hostname}/auth/1.0 -U '{uid}' -K '{key}' stat".format(`
	`74`	`+ cmd = "venv/bin/swift -A http://{hostname}/auth/1.0 -U '{uid}' -K '{key}' stat".format(`
`75`	`75`	`hostname=hostname, uid=user_info["user_id"], key=user_info["key"]`
`76`	`76`	`)`
`77`	`77`	`swift_cmd = utils.exec_shell_cmd(cmd)`