Commit 61f0b753 by zhaihuitao

update

parent 59025f02
...@@ -415,9 +415,9 @@ ...@@ -415,9 +415,9 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<list> <list>
<item itemvalue="Python.game_event" />
<item itemvalue="Python.params" /> <item itemvalue="Python.params" />
<item itemvalue="Python.run_all_cases" /> <item itemvalue="Python.run_all_cases" />
<item itemvalue="Python.game_event" />
<item itemvalue="Python tests.Nosetests for testcase.android_events._adclick.adclickTestCase.testadclick" /> <item itemvalue="Python tests.Nosetests for testcase.android_events._adclick.adclickTestCase.testadclick" />
<item itemvalue="Python tests.Nosetests for testcase.android_events._adshow.adshowTestCase.testadshow" /> <item itemvalue="Python tests.Nosetests for testcase.android_events._adshow.adshowTestCase.testadshow" />
</list> </list>
......
...@@ -9,12 +9,11 @@ ...@@ -9,12 +9,11 @@
import time import time
from config.envcfg import prod, prod_appkey from config.envcfg import prod, prod_appkey
from common import randomUtil from common import randomUtil
from testcase.run_all_cases import IMEI
params_click = { params_click = {
# 'androidid': "43214532142142", # 'androidid': "43214532142142",
'imei': IMEI, 'imei': randomUtil.r.randimei(),
# "idfa": 'DBC43622-E38B-440C-B7A7-FB6641D0D9AB', # "idfa": 'DBC43622-E38B-440C-B7A7-FB6641D0D9AB',
'ip': randomUtil.r.randip(), 'ip': randomUtil.r.randip(),
'vid': "test_vid" 'vid': "test_vid"
...@@ -66,8 +65,8 @@ params_install = { ...@@ -66,8 +65,8 @@ params_install = {
"_model": "test1", "_model": "test1",
"_pkgname": "com.yanjing.yami", "_pkgname": "com.yanjing.yami",
"_campaignid": 'default', "_campaignid": 'default',
"_deviceid": IMEI, "_deviceid": randomUtil.r.randimei(),
"_imei": IMEI, "_imei": randomUtil.r.randimei(),
# "_idfa": 'DBC13622-E34B-440C-B7A7-FB6641D0D9AB', # "_idfa": 'DBC13622-E34B-440C-B7A7-FB6641D0D9AB',
# "_androidid": "43214532142142", # "_androidid": "43214532142142",
# "_imei2":"324323AAAA", # "_imei2":"324323AAAA",
...@@ -99,13 +98,13 @@ params_startup = { ...@@ -99,13 +98,13 @@ params_startup = {
'appid': prod_appkey, 'appid': prod_appkey,
'context': { 'context': {
# '_deviceid': "CFFEF74E-B6BF-BD16-E7F8-DFDBFF5FB6E1", # '_deviceid': "CFFEF74E-B6BF-BD16-E7F8-DFDBFF5FB6E1",
'_imei': IMEI, '_imei': randomUtil.r.randimei(),
# '_androidid': "43214532142142", # '_androidid': "43214532142142",
'_ip': randomUtil.r.randip(), '_ip': randomUtil.r.randip(),
'_timestamp': int(round(time.time() * 1000)), '_timestamp': int(round(time.time() * 1000)),
"_lib_version": "1.5.0", "_lib_version": "1.5.0",
"_campaignid": 'default', "_campaignid": 'default',
"_deviceid": IMEI, "_deviceid": randomUtil.r.randimei(),
# "_imei": i, # "_imei": i,
# "_idfa": 'CFFEF74E-B6BF-BD16-E7F8-DFDBFF5FB6E1', # "_idfa": 'CFFEF74E-B6BF-BD16-E7F8-DFDBFF5FB6E1',
# "_androidid": "424653325643", # "_androidid": "424653325643",
...@@ -142,8 +141,8 @@ params_login = { ...@@ -142,8 +141,8 @@ params_login = {
# 'what': 'loggedin', # 'what': 'loggedin',
'appid': prod_appkey, 'appid': prod_appkey,
'context': { 'context': {
'_deviceid': IMEI, '_deviceid': randomUtil.r.randimei(),
'_imei': IMEI, '_imei': randomUtil.r.randimei(),
'_androidid': randomUtil.r.randimei(), '_androidid': randomUtil.r.randimei(),
'_ip': randomUtil.r.randip(), '_ip': randomUtil.r.randip(),
'_ryos': "Android", '_ryos': "Android",
...@@ -162,8 +161,8 @@ params_formate = { ...@@ -162,8 +161,8 @@ params_formate = {
"appid": prod_appkey, "appid": prod_appkey,
"context": { "context": {
"_campaignid": 'default', "_campaignid": 'default',
"_deviceid": IMEI, "_deviceid": randomUtil.r.randimei(),
"_imei": IMEI, "_imei": randomUtil.r.randimei(),
# "_imei2":i, # "_imei2":i,
# "_oaid":i, # "_oaid":i,
# "_meid":i, # "_meid":i,
...@@ -188,8 +187,8 @@ params_register = { ...@@ -188,8 +187,8 @@ params_register = {
'what':'register', 'what':'register',
'appid': prod_appkey, 'appid': prod_appkey,
'context': { 'context': {
'_deviceid': IMEI, '_deviceid': randomUtil.r.randimei(),
'_imei':IMEI, '_imei':randomUtil.r.randimei(),
# '_androidid':i, # '_androidid':i,
'_ip': randomUtil.r.randip(), '_ip': randomUtil.r.randip(),
'_timestamp': int(round(time.time() * 1000)), '_timestamp': int(round(time.time() * 1000)),
...@@ -208,8 +207,8 @@ params_pay = { ...@@ -208,8 +207,8 @@ params_pay = {
'what': 'payment', 'what': 'payment',
'appid': prod_appkey, 'appid': prod_appkey,
'context': { 'context': {
'_deviceid': IMEI, '_deviceid': randomUtil.r.randimei(),
'_imei': IMEI, '_imei': randomUtil.r.randimei(),
# '_androidid': randomUtil.r.randimei(), # '_androidid': randomUtil.r.randimei(),
'_ip': randomUtil.r.randip(), '_ip': randomUtil.r.randip(),
'_timestamp': int(round(time.time() * 1000)), '_timestamp': int(round(time.time() * 1000)),
...@@ -233,8 +232,8 @@ params_payorder = { ...@@ -233,8 +232,8 @@ params_payorder = {
'what': "order", 'what': "order",
'appid': prod_appkey, 'appid': prod_appkey,
'context': { 'context': {
'_deviceid': IMEI, '_deviceid': randomUtil.r.randimei(),
'_imei': IMEI, '_imei': randomUtil.r.randimei(),
# '_androidid': randomUtil.r.randimei(), # '_androidid': randomUtil.r.randimei(),
'_ip': randomUtil.r.randip(), '_ip': randomUtil.r.randip(),
'_timestamp': int(round(time.time() * 1000)), '_timestamp': int(round(time.time() * 1000)),
...@@ -255,8 +254,8 @@ params_custom = { ...@@ -255,8 +254,8 @@ params_custom = {
'what': "event", 'what': "event",
'appid': prod_appkey, 'appid': prod_appkey,
'context': { 'context': {
'_deviceid': IMEI, '_deviceid': randomUtil.r.randimei(),
'_imei': IMEI, '_imei': randomUtil.r.randimei(),
# '_androidid': randomUtil.r.randimei(), # '_androidid': randomUtil.r.randimei(),
'_ip': randomUtil.r.randip(), '_ip': randomUtil.r.randip(),
'_ryos': "android", '_ryos': "android",
...@@ -276,9 +275,9 @@ params_adshow = { ...@@ -276,9 +275,9 @@ params_adshow = {
'_adId': "8205", '_adId': "8205",
"_campaignid": 'default', "_campaignid": 'default',
# "_deviceid": randomUtil.r.randimei(), # "_deviceid": randomUtil.r.randimei(),
"_deviceid": IMEI, "_deviceid": randomUtil.r.randimei(),
# "_imei": randomUtil.r.randimei(), # "_imei": randomUtil.r.randimei(),
"_imei": IMEI, "_imei": randomUtil.r.randimei(),
# "_idfa": '75463565745634546', # "_idfa": '75463565745634546',
# "_androidid": "424653325643", # "_androidid": "424653325643",
# "_imei2":"324323AAAA", # "_imei2":"324323AAAA",
...@@ -308,9 +307,9 @@ params_adclick = { ...@@ -308,9 +307,9 @@ params_adclick = {
'_adId': "8205", '_adId': "8205",
"_campaignid": 'default', "_campaignid": 'default',
# "_deviceid": randomUtil.r.randimei(), # "_deviceid": randomUtil.r.randimei(),
"_deviceid": IMEI, "_deviceid": randomUtil.r.randimei(),
# "_imei": randomUtil.r.randimei(), # "_imei": randomUtil.r.randimei(),
"_imei": IMEI, "_imei": randomUtil.r.randimei(),
# "_idfa": '75463565745634546', # "_idfa": '75463565745634546',
# "_androidid": "424653325643", # "_androidid": "424653325643",
# "_imei2":"324323AAAA", # "_imei2":"324323AAAA",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment