GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-05 15:37:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: 安卓和iOS安装加锁"

Browse Source 
This reverts commit 4c9dd3286c.
This commit is contained in:
余泓铮
2025-08-12 19:15:02 +08:00
parent 4c9dd3286c
commit 9b69575169
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uixt/android_device.go
+2 -12
View File
@@ -13,7 +13,6 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"sync"
"time" "time"
"github.com/httprunner/funplugin/myexec" "github.com/httprunner/funplugin/myexec"
@@ -95,9 +94,8 @@ func NewAndroidDevice(opts ...option.AndroidDeviceOption) (device *AndroidDevice
type AndroidDevice struct { type AndroidDevice struct {
*gadb.Device *gadb.Device
Options *option.AndroidDeviceOptions Options *option.AndroidDeviceOptions
Logcat *AdbLogcat Logcat *AdbLogcat
installMutex sync.Mutex // Mutex to lock installation/uninstallation operations
} }
func (dev *AndroidDevice) Setup() error { func (dev *AndroidDevice) Setup() error {
@@ -156,10 +154,6 @@ func (dev *AndroidDevice) NewDriver() (driver IDriver, err error) {
} }
func (dev *AndroidDevice) Install(apkPath string, opts ...option.InstallOption) error { func (dev *AndroidDevice) Install(apkPath string, opts ...option.InstallOption) error {
// Lock the device for installation
dev.installMutex.Lock()
defer dev.installMutex.Unlock()
installOpts := option.NewInstallOptions(opts...) installOpts := option.NewInstallOptions(opts...)
brand, err := dev.Device.Brand() brand, err := dev.Device.Brand()
if err != nil { if err != nil {
@@ -267,10 +261,6 @@ func (dev *AndroidDevice) installCommon(apkPath string, args ...string) error {
} }
func (dev *AndroidDevice) Uninstall(packageName string) error { func (dev *AndroidDevice) Uninstall(packageName string) error {
// Lock the device for uninstallation
dev.installMutex.Lock()
defer dev.installMutex.Unlock()
_, err := dev.Device.Uninstall(packageName) _, err := dev.Device.Uninstall(packageName)
return err return err
} }
uixt/ios_device.go
-10
View File
@@ -7,7 +7,6 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"sync"
"time" "time"
"github.com/Masterminds/semver" "github.com/Masterminds/semver"
@@ -129,7 +128,6 @@ type IOSDevice struct {
listener *forward.ConnListener listener *forward.ConnListener
localPort int localPort int
} }
installMutex sync.Mutex // Mutex to lock installation/uninstallation operations
} }
type DeviceDetail struct { type DeviceDetail struct {
@@ -267,10 +265,6 @@ func (dev *IOSDevice) NewDriver() (driver IDriver, err error) {
} }
func (dev *IOSDevice) Install(appPath string, opts ...option.InstallOption) (err error) { func (dev *IOSDevice) Install(appPath string, opts ...option.InstallOption) (err error) {
// Lock the device for installation
dev.installMutex.Lock()
defer dev.installMutex.Unlock()
installOpts := option.NewInstallOptions(opts...) installOpts := option.NewInstallOptions(opts...)
for i := 0; i <= installOpts.RetryTimes; i++ { for i := 0; i <= installOpts.RetryTimes; i++ {
var conn *zipconduit.Connection var conn *zipconduit.Connection
@@ -290,10 +284,6 @@ func (dev *IOSDevice) Install(appPath string, opts ...option.InstallOption) (err
} }
func (dev *IOSDevice) Uninstall(bundleId string) error { func (dev *IOSDevice) Uninstall(bundleId string) error {
// Lock the device for uninstallation
dev.installMutex.Lock()
defer dev.installMutex.Unlock()
svc, err := installationproxy.New(dev.DeviceEntry) svc, err := installationproxy.New(dev.DeviceEntry)
if err != nil { if err != nil {
return err return err