mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-05 23:51:25 +08:00
feat: get androidsystemVersion with gadb
This commit is contained in:
@@ -1 +1 @@
|
|||||||
v5.0.0-beta-2503052233
|
v5.0.0-beta-2503061328
|
||||||
|
|||||||
+15
-2
@@ -147,15 +147,28 @@ func (d *Device) Usb() (string, error) {
|
|||||||
return "", errors.New("does not have attribute: usb")
|
return "", errors.New("does not have attribute: usb")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *Device) SystemVersion() (string, error) {
|
||||||
|
if d.HasAttribute("systemVersion") {
|
||||||
|
return d.attrs["systemVersion"], nil
|
||||||
|
}
|
||||||
|
systemVersion, err := d.RunShellCommand("getprop", "ro.build.version.release")
|
||||||
|
systemVersion = strings.TrimSpace(systemVersion)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.New("get android system version failed")
|
||||||
|
}
|
||||||
|
d.attrs["systemVersion"] = systemVersion
|
||||||
|
return systemVersion, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (d *Device) SdkVersion() (string, error) {
|
func (d *Device) SdkVersion() (string, error) {
|
||||||
if d.HasAttribute("sdkVersion") {
|
if d.HasAttribute("sdkVersion") {
|
||||||
return d.attrs["sdkVersion"], nil
|
return d.attrs["sdkVersion"], nil
|
||||||
}
|
}
|
||||||
sdkVersion, err := d.RunShellCommand("getprop", "ro.build.version.sdk")
|
sdkVersion, err := d.RunShellCommand("getprop", "ro.build.version.sdk")
|
||||||
sdkVersion = strings.TrimSpace(sdkVersion)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", errors.New("does not have attribute: sdkVersion")
|
return "", errors.New("get android sdk version failed")
|
||||||
}
|
}
|
||||||
|
sdkVersion = strings.TrimSpace(sdkVersion)
|
||||||
d.attrs["sdkVersion"] = sdkVersion
|
d.attrs["sdkVersion"] = sdkVersion
|
||||||
return sdkVersion, nil
|
return sdkVersion, nil
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-3
@@ -9,6 +9,9 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
var devices []*Device
|
var devices []*Device
|
||||||
@@ -17,9 +20,7 @@ func setupDevices(t *testing.T) {
|
|||||||
var err error
|
var err error
|
||||||
setupClient(t)
|
setupClient(t)
|
||||||
devices, err = adbClient.DeviceList()
|
devices, err = adbClient.DeviceList()
|
||||||
if err != nil {
|
require.Nil(t, err)
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDevice_State(t *testing.T) {
|
func TestDevice_State(t *testing.T) {
|
||||||
@@ -119,6 +120,24 @@ func TestDevice_DeviceInfo(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDevice_SdkVersion(t *testing.T) {
|
||||||
|
setupDevices(t)
|
||||||
|
for _, device := range devices {
|
||||||
|
sdkVersion, err := device.SdkVersion()
|
||||||
|
assert.Nil(t, err)
|
||||||
|
t.Log(device.Serial(), sdkVersion)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDevice_SystemVersion(t *testing.T) {
|
||||||
|
setupDevices(t)
|
||||||
|
for _, device := range devices {
|
||||||
|
systemVersion, err := device.SystemVersion()
|
||||||
|
assert.Nil(t, err)
|
||||||
|
t.Log(device.Serial(), systemVersion)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestDevice_Forward(t *testing.T) {
|
func TestDevice_Forward(t *testing.T) {
|
||||||
setupDevices(t)
|
setupDevices(t)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user